From 97ca77c65d91fd00ca67dac6688879bf11ccce30 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Wed, 7 Nov 2018 18:58:18 +0100 Subject: [PATCH 1/8] Upgrading to 3.141.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd1371e8..9a3e52f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -267,8 +267,8 @@ RUN echo "${UBUNTU_FLAVOR}" > UBUNTU_FLAVOR \ # Selenium latest #================= # Layer size: medium ~22 MB -ARG SEL_DIRECTORY="3.14" -ENV SEL_VER="3.14.0" +ARG SEL_DIRECTORY="3.141" +ENV SEL_VER="3.141.0" RUN echo $SEL_VER RUN export SELBASE="https://selenium-release.storage.googleapis.com" \ From d639d92c9df47af848ca73641ceca514bbf918fa Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Wed, 7 Nov 2018 19:16:43 +0100 Subject: [PATCH 2/8] Upgrading Python bindings --- test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/requirements.txt b/test/requirements.txt index 9ec9eafc..b0ac9aa5 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,2 +1,2 @@ -selenium==3.14.0 +selenium==3.141.0 retrying>=1.3.3 From 72c8ef29aad99be0a7970eb402c6ccb60443677e Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Wed, 7 Nov 2018 19:28:36 +0100 Subject: [PATCH 3/8] Bumping right away to 3.141.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a3e52f0..83c359ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -268,7 +268,7 @@ RUN echo "${UBUNTU_FLAVOR}" > UBUNTU_FLAVOR \ #================= # Layer size: medium ~22 MB ARG SEL_DIRECTORY="3.141" -ENV SEL_VER="3.141.0" +ENV SEL_VER="3.141.5" RUN echo $SEL_VER RUN export SELBASE="https://selenium-release.storage.googleapis.com" \ From 34ee050cec6c2a18ad27ee71dff573b4f0d6af75 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Wed, 14 Nov 2018 09:39:31 +0100 Subject: [PATCH 4/8] Bumping now to 3.141.59 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 83c359ea..68224ab9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -268,7 +268,7 @@ RUN echo "${UBUNTU_FLAVOR}" > UBUNTU_FLAVOR \ #================= # Layer size: medium ~22 MB ARG SEL_DIRECTORY="3.141" -ENV SEL_VER="3.141.5" +ENV SEL_VER="3.141.59" RUN echo $SEL_VER RUN export SELBASE="https://selenium-release.storage.googleapis.com" \ From 93fa669f3e33aaa4a37eb8385706d1af3f164eef Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Thu, 15 Nov 2018 19:47:15 +0100 Subject: [PATCH 5/8] Waiting for the Grid to be ready before starting tests. --- test/selenium_test.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/selenium_test.sh b/test/selenium_test.sh index 36f03579..89865523 100755 --- a/test/selenium_test.sh +++ b/test/selenium_test.sh @@ -33,6 +33,12 @@ fi mkdir -p ${HOME}/.local # pip install --user --requirement /test/requirements.txt +while ! curl -sSL "http://localhost:4444/wd/hub/status" 2>&1 \ + | jq -r '.value.ready' 2>&1 | grep "true" >/dev/null; do + echo 'Waiting for the Grid' + sleep 1 +done + python_test ${browser_name} if [ "${VIDEO}" = "true" ]; then From 24cca86d82c1d61763db842cd01c6a448ead61bc Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Thu, 15 Nov 2018 20:16:15 +0100 Subject: [PATCH 6/8] Waiting for the Grid to be ready before starting tests, in the right spot --- test/script_scenario_make | 13 +++++++++++++ test/selenium_test.sh | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/test/script_scenario_make b/test/script_scenario_make index 64b1fb2c..bf5beed7 100755 --- a/test/script_scenario_make +++ b/test/script_scenario_make @@ -31,6 +31,19 @@ else # import -screen -window "${WIN_TITLE}" images/vnc_screenshot.png fi +set +x +echo "#===================================" +echo "# Waiting for the Grid before running tests. +echo "#===================================" + +while ! curl -sSL "http://localhost:4444/wd/hub/status" 2>&1 \ + | jq -r '.value.ready' 2>&1 | grep "true" >/dev/null; do + echo 'Waiting for the Grid' + sleep 1 +done +set -x + + make test rm -f videos/*.mp4 make videos diff --git a/test/selenium_test.sh b/test/selenium_test.sh index 89865523..36f03579 100755 --- a/test/selenium_test.sh +++ b/test/selenium_test.sh @@ -33,12 +33,6 @@ fi mkdir -p ${HOME}/.local # pip install --user --requirement /test/requirements.txt -while ! curl -sSL "http://localhost:4444/wd/hub/status" 2>&1 \ - | jq -r '.value.ready' 2>&1 | grep "true" >/dev/null; do - echo 'Waiting for the Grid' - sleep 1 -done - python_test ${browser_name} if [ "${VIDEO}" = "true" ]; then From ba832ea35279c7c9391149cd75178b6dfe84efc3 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Thu, 15 Nov 2018 20:29:12 +0100 Subject: [PATCH 7/8] Fixing typo --- test/script_scenario_make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script_scenario_make b/test/script_scenario_make index bf5beed7..91d499ba 100755 --- a/test/script_scenario_make +++ b/test/script_scenario_make @@ -33,7 +33,7 @@ fi set +x echo "#===================================" -echo "# Waiting for the Grid before running tests. +echo "# Waiting for the Grid before running tests." echo "#===================================" while ! curl -sSL "http://localhost:4444/wd/hub/status" 2>&1 \ From 60e70b311ea0463184b179c5a8fc6249e576d1e2 Mon Sep 17 00:00:00 2001 From: Leo Gallucci Date: Thu, 15 Nov 2018 21:00:37 +0100 Subject: [PATCH 8/8] Use make wait before make test --- test/script_scenario_make | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/test/script_scenario_make b/test/script_scenario_make index 91d499ba..9e30c127 100755 --- a/test/script_scenario_make +++ b/test/script_scenario_make @@ -31,19 +31,7 @@ else # import -screen -window "${WIN_TITLE}" images/vnc_screenshot.png fi -set +x -echo "#===================================" -echo "# Waiting for the Grid before running tests." -echo "#===================================" - -while ! curl -sSL "http://localhost:4444/wd/hub/status" 2>&1 \ - | jq -r '.value.ready' 2>&1 | grep "true" >/dev/null; do - echo 'Waiting for the Grid' - sleep 1 -done -set -x - - +make wait make test rm -f videos/*.mp4 make videos @@ -81,6 +69,7 @@ if [ "${GIT_TAG_OR_BRANCH}" != "" ]; then fi # Test default 1 chrome 1 firefox case make + make wait make test # Test alias make down