Commit 08fd3ac5 by Calen Pennington

Enable multiprocess tests on LMS tests in jenkins

parent dcf5fd3e
...@@ -126,8 +126,7 @@ class SystemTestSuite(NoseTestSuite): ...@@ -126,8 +126,7 @@ class SystemTestSuite(NoseTestSuite):
self.randomize = kwargs.get('randomize', None) self.randomize = kwargs.get('randomize', None)
if self.processes is None: if self.processes is None:
# Use one process per core for LMS tests, and no multiprocessing # Don't use multiprocessing by default
# otherwise.
self.processes = 0 self.processes = 0
self.processes = int(self.processes) self.processes = int(self.processes)
......
...@@ -99,22 +99,23 @@ case "$TEST_SUITE" in ...@@ -99,22 +99,23 @@ case "$TEST_SUITE" in
;; ;;
"lms-unit") "lms-unit")
LMS_ARGS="--with-flaky" EXTRA_ARGS="--with-flaky"
PAVER_ARGS="--processes=-1 --cov_args='-p' -v"
case "$SHARD" in case "$SHARD" in
"all") "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") "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") "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") "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") "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 # If no shard is specified, rather than running all tests, create an empty xunit file. This is a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment