Find free xvfb display instead of hardcoded 99 using the -a option

Up until now the xvfb display has been hardcoded to 99 for all nodes.
This sometimes causes errors if the display is not actually free.
xvfb-run has a -a --auto-servernum option, which tries to get a free
server number, starting at 99, or the argument to --server-num.

Fixes #772

Author: Antonello Caboni

Makefile

@@ -211,8 +211,7 @@ release: tag_major_minor
 	docker push $(NAME)/standalone-chrome-debug:$(MAJOR_MINOR_PATCH)
 	docker push $(NAME)/standalone-firefox-debug:$(MAJOR_MINOR_PATCH)
 
-test: test_shell_functions \
- test_chrome \
+test: test_chrome \
  test_firefox \
  test_chrome_debug \
  test_firefox_debug \
@@ -222,9 +221,6 @@ test: test_shell_functions \
  test_firefox_standalone_debug
 
 
-test_shell_functions:
-	./tests/test-shell-functions.sh
-
 test_chrome:
 	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
 

NodeBase/Dockerfile.txt

@@ -72,17 +72,14 @@ USER seluser
 #==============================
 # Scripts to run Selenium Node
 #==============================
-COPY entry_point.sh \
-  functions.sh \
-    /opt/bin/
+COPY entry_point.sh  /opt/bin/
 
 #============================
 # Some configuration options
 #============================
 ENV SCREEN_WIDTH 1360
 ENV SCREEN_HEIGHT 1020
 ENV SCREEN_DEPTH 24
-ENV DISPLAY :99.0
 
 #========================
 # Selenium Configuration

NodeBase/entry_point.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source /opt/bin/functions.sh
 /opt/bin/generate_config > /opt/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
@@ -42,11 +41,9 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi
 
-SERVERNUM=$(get_server_num)
-
 rm -f /tmp/.X*lock
 
-xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
+xvfb-run -a --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \

NodeBase/functions.sh

@@ -2,7 +2,6 @@
 #
 # IMPORTANT: Change this file only in directory NodeDebug!
 
-source /opt/bin/functions.sh
 /opt/bin/generate_config > /opt/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
@@ -51,12 +50,9 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi
 
-SERVERNUM=$(get_server_num)
-
 rm -f /tmp/.X*lock
 
-DISPLAY=$DISPLAY \
-  xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
+xvfb-run -a --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
@@ -68,6 +64,11 @@ NODE_PID=$!
 trap shutdown SIGTERM SIGINT
 for i in $(seq 1 10)
 do
+  DISPLAY=$(xvfb-run printenv DISPLAY)
+  if [ -z "$DISPLAY" ]; then
+    echo "\$DISPLAY env variable is empty"
+    break
+  fi
   xdpyinfo -display $DISPLAY >/dev/null 2>&1
   if [ $? -eq 0 ]; then
     break

NodeBase/test-functions.sh

@@ -2,8 +2,6 @@
 #
 # IMPORTANT: Change this file only in directory Standalone!
 
-source /opt/bin/functions.sh
-
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
 function shutdown {
@@ -15,11 +13,9 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi
 
-SERVERNUM=$(get_server_num)
-
 rm -f /tmp/.X*lock
 
-xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
+xvfb-run -a --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!

NodeDebug/entry_point.sh

@@ -2,8 +2,6 @@
 #
 # IMPORTANT: Change this file only in directory StandaloneDebug!
 
-source /opt/bin/functions.sh
-
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
 function shutdown {
@@ -24,17 +22,19 @@ fi
 
 rm -f /tmp/.X*lock
 
-SERVERNUM=$(get_server_num)
-
-DISPLAY=$DISPLAY \
-  xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
+xvfb-run -a --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
 for i in $(seq 1 10)
 do
+  DISPLAY=$(xvfb-run printenv DISPLAY)
+  if [ -z "$DISPLAY" ]; then
+    echo "\$DISPLAY env variable is empty"
+    break
+  fi
   xdpyinfo -display $DISPLAY >/dev/null 2>&1
   if [ $? -eq 0 ]; then
     break