From 5249504edcb23696174107bac073a6262cdc3d3e Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Tue, 10 May 2016 14:29:47 -0400
Subject: [PATCH] Use xunitmp by default, rather than standard xunit

---
 cms/envs/test.py                        | 1 -
 lms/envs/test.py                        | 1 -
 pavelib/utils/test/suites/nose_suite.py | 2 +-
 setup.cfg                               | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cms/envs/test.py b/cms/envs/test.py
index ce5f618b2ef..a7072c58cb8 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -54,7 +54,6 @@ _NOSEID_DIR.makedirs_p()
 
 NOSE_ARGS = [
     '--id-file', _NOSEID_DIR / 'noseids',
-    '--xunit-file', _REPORT_DIR / 'nosetests.xml',
 ]
 
 NOSE_PLUGINS = [
diff --git a/lms/envs/test.py b/lms/envs/test.py
index cda9f23b46b..a03b51ab9ee 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -96,7 +96,6 @@ _NOSEID_DIR.makedirs_p()
 
 NOSE_ARGS = [
     '--id-file', _NOSEID_DIR / 'noseids',
-    '--xunit-file', _REPORT_DIR / 'nosetests.xml',
 ]
 
 NOSE_PLUGINS = [
diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index e7f93defd81..8f5007e3837 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -121,7 +121,7 @@ class SystemTestSuite(NoseTestSuite):
         cmd = (
             './manage.py {system} test --verbosity={verbosity} '
             '{test_id} {test_opts} --settings=test {extra} '
-            '--with-xunit --xunit-file={xunit_report}'.format(
+            '--with-xunitmp --xunitmp-file={xunit_report}'.format(
                 system=self.root,
                 verbosity=self.verbosity,
                 test_id=self.test_id,
diff --git a/setup.cfg b/setup.cfg
index 3a604a87fe0..9569dc4d0a3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [nosetests]
 logging-clear-handlers=1
-with-xunit=1
+with-xunitmp=1
 with-ignore-docstrings=1
 with-id=1
 exclude-dir=lms/envs
-- 
GitLab