diff --git a/README.md b/README.md index 9439d27799..0261f87b46 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ - - Selenium Tests Status - - This is the main edX platform which consists of LMS and Studio. See [code.edx.org](http://code.edx.org/) for other parts of the edX code base. diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 37107c7f70..335a027c7c 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -19,7 +19,7 @@ import logging logging.disable(logging.ERROR) import os from random import choice -PORTS = [80, 443, 888, 2000, 2001, 2020, 2109, 2222, 2310, 3000, 3001, +PORTS = [2000, 2001, 2020, 2109, 2222, 2310, 3000, 3001, 3030, 3210, 3333, 4000, 4001, 4040, 4321, 4502, 4503, 5000, 5001, 5050, 5555, 5432, 6000, 6001, 6060, 6666, 6543, 7000, 7070, 7774, 7777, 8000, 8001, 8003, 8031, 8080, 8081, 8765, 8888, 9000, 9001, diff --git a/jenkins/test_acceptance.sh b/jenkins/test_acceptance.sh index b7a244fe99..1bc88744bf 100755 --- a/jenkins/test_acceptance.sh +++ b/jenkins/test_acceptance.sh @@ -30,10 +30,18 @@ TESTS_FAILED=0 # /usr/bin/Xvfb :1 -screen 0 1024x268x24 # This allows us to run Chrome without a display export DISPLAY=:1 +SKIP_TESTS="" + +if [ ! -z ${LETTUCE_BROWSER+x} ]; then + SKIP_TESTS="--tag -$(tr '[:lower:]' '[:upper:]' <<< ${LETTUCE_BROWSER:0:1})${LETTUCE_BROWSER:1}" +fi +if [ ! -z ${SAUCE_ENABLED+x} ]; then + SKIP_TESTS="--tag -Sauce --tag -$(tr '[:lower:]' '[:upper:]' <<< ${SAUCE_BROWSER:0:1})${SAUCE_BROWSER:1}" +fi # Run the lms and cms acceptance tests # (the -v flag turns off color in the output) -rake test_acceptance_lms["-v 3"] || TESTS_FAILED=1 -rake test_acceptance_cms["-v 3"] || TESTS_FAILED=1 +rake test_acceptance_lms["-v 3 $SKIP_TESTS"] || TESTS_FAILED=1 +rake test_acceptance_cms["-v 3 $SKIP_TESTS"] || TESTS_FAILED=1 [ $TESTS_FAILED == '0' ] diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 6de7861d71..60c5d04997 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -20,7 +20,7 @@ import logging logging.disable(logging.ERROR) import os from random import choice -PORTS = [80, 443, 888, 2000, 2001, 2020, 2109, 2222, 2310, 3000, 3001, +PORTS = [2000, 2001, 2020, 2109, 2222, 2310, 3000, 3001, 3030, 3210, 3333, 4000, 4001, 4040, 4321, 4502, 4503, 5000, 5001, 5050, 5555, 5432, 6000, 6001, 6060, 6666, 6543, 7000, 7070, 7774, 7777, 8000, 8001, 8003, 8031, 8080, 8081, 8765, 8888, 9000, 9001,