From 08fd3ac57cdc9cdcbc7f3deb2c113826bc3e6009 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Tue, 14 Jun 2016 12:46:10 -0400
Subject: [PATCH] Enable multiprocess tests on LMS tests in jenkins

---
 pavelib/utils/test/suites/nose_suite.py |  3 +--
 scripts/generic-ci-tests.sh             | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index 61d2225552..dbdaa28fed 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -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)
diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh
index 9cb3f07c31..cbdee47be5 100755
--- a/scripts/generic-ci-tests.sh
+++ b/scripts/generic-ci-tests.sh
@@ -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