Issue arknoll#43 Don't launch Xvfb.

PaddleCMS · Aug 14, 2017 · 6069f3c · 6069f3c
1 parent 4fda3ee
commit 6069f3c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/templates/selenium-init-Debian.j2 b/templates/selenium-init-Debian.j2
@@ -37,7 +37,7 @@ case "$1" in
         else
             log_daemon_msg "Starting Selenium server"
             log_progress_msg "selenium"
-            start-stop-daemon -c $RUN_AS --start --quiet --background --pidfile $DAEMON_PID_FILE --make-pidfile --exec $XVFB_BIN {{ selenium_xvfb_args }} $JAVA_BIN -- $SELENIUM_DAEMON_OPTS
+            start-stop-daemon -c $RUN_AS --start --quiet --background --pidfile $DAEMON_PID_FILE --make-pidfile --exec $JAVA_BIN -- $SELENIUM_DAEMON_OPTS
         fi
         ;;
 

diff --git a/templates/selenium-init-RedHat.j2 b/templates/selenium-init-RedHat.j2
@@ -16,7 +16,7 @@ selenium_dir={{ selenium_install_dir }}/selenium
 selenium_jar_file="$selenium_dir/selenium-server-standalone-{{ selenium_version }}.jar"
 user=root
 display="{{ selenium_display_id }}"
-exec="$xvfb_bin {{ selenium_xvfb_args }} --server-num=$display $java_bin"
+exec="$java_bin"
 args=" -client -jar $selenium_jar_file -p {{ selenium_port }}"
 lockfile="/var/lock/subsys/selenium"
 pidfile="$selenium_dir/selenium.pid"

diff --git a/templates/selenium-unit.j2 b/templates/selenium-unit.j2
@@ -3,7 +3,7 @@ Description=selenium test framework
 After=syslog.target network.target
 
 [Service]
-ExecStart=/usr/bin/xvfb-run {{ selenium_xvfb_args }} /usr/bin/java -client -jar {{ selenium_install_dir }}/selenium/selenium-server-standalone-{{ selenium_version }}.jar
+ExecStart=/usr/bin/java -client -jar {{ selenium_install_dir }}/selenium/selenium-server-standalone-{{ selenium_version }}.jar
 Restart=on-failure
 RestartSec=20s