diff --git a/t/selenium/nose2cfg/jenkinstest.cfg b/t/selenium/nose2cfg/jenkinstest.cfg index e88f7f4b..f0aa1aab 100644 --- a/t/selenium/nose2cfg/jenkinstest.cfg +++ b/t/selenium/nose2cfg/jenkinstest.cfg @@ -1,3 +1,6 @@ +#this is the test configuration for running tests on jenkins. +#the only difference between this and localtest.cfg is that this will generate a junit result file + [unittest] plugins = nose2.plugins.junitxml nose2.plugins.mp @@ -9,11 +12,10 @@ keep_restricted = False path = /results/selenium.xml test_fullname = True -[multiprocess] +[multiprocess] #change thread count here. should be the same as in testrunner always-on = True processes = 2 - [output-buffer] always-on = True stderr = False diff --git a/t/selenium/nose2cfg/localtest.cfg b/t/selenium/nose2cfg/localtest.cfg index 7e050547..88a00126 100644 --- a/t/selenium/nose2cfg/localtest.cfg +++ b/t/selenium/nose2cfg/localtest.cfg @@ -1,3 +1,6 @@ +#this is the test configuration for running tests on your local machine. +#the only difference between this and jenkinstest.cfg is that this wont generate a junit result file + [unittest] plugins = nose2.plugins.junitxml nose2.plugins.mp @@ -9,7 +12,7 @@ keep_restricted = False path = selenium.xml test_fullname = True -[multiprocess] +[multiprocess] #change thread count here. should be the same as in testrunner always-on = True processes = 2 diff --git a/t/selenium/testrunner b/t/selenium/testrunner index e4507ed7..bc44db96 100755 --- a/t/selenium/testrunner +++ b/t/selenium/testrunner @@ -55,15 +55,16 @@ RC=0 export CATALYST_SERVER="https://${SERVER}" cd t/selenium -#Change thread count here and in nose2 config files -export THREADS=2 - if [ "${OUTPUT_TYPE:-}" = "junit" ] ; then + #Change thread count here and in nose2cfg/jenkinstest.cfg + export THREADS=2 export JENKINS=1 python3 testrun.py -v -c nose2cfg/jenkinstest.cfg | \ tee -a "${OUTPUT_DIRECTORY}/selenium.xml" RC="${PIPESTATUS[0]}" else + #Change thread count here and in nose2cfg/localtest.cfg + export THREADS=2 python3 testrun.py -v -c nose2cfg/localtest.cfg|| RC=$? fi