TT#70901 selenium: properly seperate threading settings

- seperate thread settings for local and jenkins tests. this setting was
pretty much useless before.

- add some help text in config files.

Change-Id: Ib9358d3878519390b02beb7c3444b4fc53ad1844
changes/32/37632/1
Nico Schedel 5 years ago
parent 0ba12d7196
commit 298821226e

@ -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

@ -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

@ -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

Loading…
Cancel
Save