Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable multiprocess tests on LMS tests in jenkins

Browse Source
This commit is contained in:
Calen Pennington
2016-06-14 12:46:10 -04:00
parent dcf5fd3e8f
commit 08fd3ac57c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pavelib/utils/test/suites/nose_suite.py
View File

@@ -126,8 +126,7 @@ class SystemTestSuite(NoseTestSuite):
self.randomize = kwargs.get('randomize', None)
if self.processes is None:
# Use one process per core for LMS tests, and no multiprocessing
# otherwise.
# Don't use multiprocessing by default
self.processes = 0
self.processes = int(self.processes)

13
scripts/generic-ci-tests.sh
View File

@@ -99,22 +99,23 @@ case "$TEST_SUITE" in
;;
"lms-unit")
LMS_ARGS="--with-flaky"
EXTRA_ARGS="--with-flaky"
PAVER_ARGS="--processes=-1 --cov_args='-p' -v"
case "$SHARD" in
"all")
paver test_system -s lms --extra_args="$LMS_ARGS" --cov_args="-p" -v
paver test_system -s lms --extra_args="$EXTRA_ARGS" $PAVER_ARGS
;;
"1")
paver test_system -s lms --extra_args="--attr='shard_1' $LMS_ARGS" --cov_args="-p" -v
paver test_system -s lms --extra_args="--attr='shard_1' $EXTRA_ARGS" $PAVER_ARGS
;;
"2")
paver test_system -s lms --extra_args="--attr='shard_2' $LMS_ARGS" --cov_args="-p" -v
paver test_system -s lms --extra_args="--attr='shard_2' $EXTRA_ARGS" $PAVER_ARGS
;;
"3")
paver test_system -s lms --extra_args="--attr='shard_3' $LMS_ARGS" --cov_args="-p" -v
paver test_system -s lms --extra_args="--attr='shard_3' $EXTRA_ARGS" $PAVER_ARGS
;;
"4")
paver test_system -s lms --extra_args="--attr='shard_1=False,shard_2=False,shard_3=False' $LMS_ARGS" --cov_args="-p" -v
paver test_system -s lms --extra_args="--attr='shard_1=False,shard_2=False,shard_3=False' $EXTRA_ARGS" $PAVER_ARGS
;;
*)
# If no shard is specified, rather than running all tests, create an empty xunit file. This is a