Minor chores

Author: elgalu

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 ## Local
 For pull requests or local commits:
 
-    ./test/before_install_build && ./test/install && ./test/script && docker tag selenium:latest elgalu/selenium:latest
+    ./test/before_install_build && ./test/install && ./test/script
     docker exec grid versions && ./test/after_script
     open ./images/grid_console.png #to verify the versions are correct
     git checkout ./images/grid_console.png && open ./videos/chrome/test.mkv

docs/docker-compose.md

@@ -1,7 +1,8 @@
 # Compose
-Scale up and down the nodes by using [docker-compose](https://docs.docker.com/compose/). Install the tooling by following that link.
+Scale up and down the nodes by using [docker-compose](https://docs.docker.com/compose/). Install the tooling by following that link and make sure you have latest stable versions of both tools, docker and docker-compose:
 
-    docker-compose --version #=> version 1.7.1, build 0a9ab35
+    docker --version         #=> 1.11.2
+    docker-compose --version #=> 1.7.1
 
 ## Usage
 Either clone this repository or download the file [docker-compose.yml](../docker-compose.yml) using `wget`

test/compose-test.sh

@@ -23,9 +23,6 @@ die () {
 [ -z "${SELENIUM_HUB_PORT}" ] && die "Required env var SELENIUM_HUB_PORT"
 [ -z "${WAIT_ALL_DONE}" ] && export WAIT_ALL_DONE="40s"
 
-SLEEP_LOCALLY=0
-SLEEP_TRAVIS=3
-
 # Ensure clean
 docker-compose -p selenium down || true
 
@@ -35,8 +32,7 @@ docker-compose -p selenium scale hub=1 chrome=${NUM_NODES} firefox=${NUM_NODES}
 # FIXME: We still need to wait a bit because the nodes registration is not
 #        being waited on wait_all_done script :(
 #        mabe related to issue #83
-sleep ${SLEEP_LOCALLY}
-[ "${TRAVIS}" = "true" ] && sleep ${SLEEP_TRAVIS}
+sleep ${SLEEP_TIME}
 
 # Wait then show errors, if any
 if ! docker exec selenium_hub_1 wait_all_done ${WAIT_ALL_DONE}; then
@@ -61,8 +57,7 @@ done
 # FIXME: We still need to wait a bit because the nodes registration is not
 #        being waited on wait_all_done script :(
 #        mabe related to issue #83
-sleep ${SLEEP_LOCALLY}
-[ "${TRAVIS}" = "true" ] && sleep ${SLEEP_TRAVIS}
+sleep ${SLEEP_TIME}
 
 # Tests can run anywere, in the hub, in the host, doesn't matter
 for i in $(seq 1 ${PARAL_TESTS}); do
@@ -74,8 +69,7 @@ for i in $(seq 1 ${PARAL_TESTS}); do
 done
 
 # sleep a moment to let the UI tests start
-sleep ${SLEEP_LOCALLY}
-[ "${TRAVIS}" = "true" ] && sleep ${SLEEP_TRAVIS}
+sleep ${SLEEP_TIME}
 
 # not so verbose from here
 set +x

test/script_scenario_3

@@ -7,5 +7,13 @@ set -xe
 echo "#======================================================="
 echo "# Scenario 3: Docker Compose 1 hub, 1 chrome, 1 firefox"
 echo "#======================================================="
-export NUM_NODES=1 PARAL_TESTS=1 SELENIUM_HUB_PORT="4444"
+export SELENIUM_HUB_PORT="4444" NUM_NODES=1 PARAL_TESTS=1
+
+if [ "${TRAVIS}" = "true" ]; then
+  export SLEEP_TIME=7
+else
+  # My local laptop has more power so hit it harder
+  export SLEEP_TIME=0
+fi
+
 ./test/compose-test.sh

test/script_scenario_4

@@ -10,10 +10,10 @@ echo "#======================================="
 export SELENIUM_HUB_PORT="4444"
 
 if [ "${TRAVIS}" = "true" ]; then
-  export NUM_NODES=2 PARAL_TESTS=2 WAIT_ALL_DONE="390s"
+  export NUM_NODES=3 PARAL_TESTS=3 WAIT_ALL_DONE="390s" SLEEP_TIME=10
 else
   # My local laptop has more power so hit it harder
-  export NUM_NODES=7 PARAL_TESTS=7 WAIT_ALL_DONE="90s"
+  export NUM_NODES=7 PARAL_TESTS=7 WAIT_ALL_DONE="90s" SLEEP_TIME=3
 fi
 
 ./test/compose-test.sh