From 7ca92f255ab222f6b75dc78d9596c1a851b267e9 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 20 May 2016 08:59:05 -0400 Subject: [PATCH 1/2] Enable randomization (but not concurrency) in LMS unit tests --- pavelib/utils/test/suites/nose_suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py index 1544ccaaaa..533416a668 100644 --- a/pavelib/utils/test/suites/nose_suite.py +++ b/pavelib/utils/test/suites/nose_suite.py @@ -133,7 +133,7 @@ class SystemTestSuite(NoseTestSuite): self.processes = int(self.processes) if self.randomize is None: - self.randomize = False + self.randomize = self.root == 'lms' if self.processes != 0 and self.verbosity > 1: print colorize( From 2afc9e8c165faa3c657882102094a3fc84bfb292 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 3 Jun 2016 10:03:23 -0400 Subject: [PATCH 2/2] Don't use the --processes argument at all of processes=0 --- pavelib/utils/test/suites/nose_suite.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py index 533416a668..61d2225552 100644 --- a/pavelib/utils/test/suites/nose_suite.py +++ b/pavelib/utils/test/suites/nose_suite.py @@ -158,9 +158,12 @@ class SystemTestSuite(NoseTestSuite): self.extra_args, '--with-xunitmp', '--xunitmp-file={}'.format(self.report_dir / "nosetests.xml"), - '--processes={}'.format(self.processes), '--with-database-isolation', ] + + if self.processes != 0: + cmd.append('--processes={}'.format(self.processes)) + if self.randomize: cmd.append('--with-randomly')