innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #26980 -- Added ParallelTestSuite.runner_class to aid subclassing.

This commit is contained in:
Chris Jerdonek 2016-08-02 11:15:06 -07:00 committed by Tim Graham
parent 54afa960d1
commit ef92ed530e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/test/runner.py
View File

@ -257,8 +257,8 @@ def _run_subsuite(args):
This helper lives at module-level and its arguments are wrapped in a tuple This helper lives at module-level and its arguments are wrapped in a tuple
because of the multiprocessing module's requirements. because of the multiprocessing module's requirements.
""" """
subsuite_index, subsuite, failfast = args runner_class, subsuite_index, subsuite, failfast = args
runner = RemoteTestRunner(failfast=failfast) runner = runner_class(failfast=failfast)
result = runner.run(subsuite) result = runner.run(subsuite)
return subsuite_index, result.events return subsuite_index, result.events
@ -282,6 +282,7 @@ class ParallelTestSuite(unittest.TestSuite):
# In case someone wants to modify these in a subclass. # In case someone wants to modify these in a subclass.
init_worker = _init_worker init_worker = _init_worker
run_subsuite = _run_subsuite run_subsuite = _run_subsuite
runner_class = RemoteTestRunner
def __init__(self, suite, processes, failfast=False): def __init__(self, suite, processes, failfast=False):
self.subsuites = partition_suite_by_case(suite) self.subsuites = partition_suite_by_case(suite)
@ -313,7 +314,7 @@ class ParallelTestSuite(unittest.TestSuite):
initializer=self.init_worker.__func__, initializer=self.init_worker.__func__,
initargs=[counter]) initargs=[counter])
args = [ args = [
(index, subsuite, self.failfast) (self.runner_class, index, subsuite, self.failfast)
for index, subsuite in enumerate(self.subsuites) for index, subsuite in enumerate(self.subsuites)
] ]
test_results = pool.imap_unordered(self.run_subsuite.__func__, args) test_results = pool.imap_unordered(self.run_subsuite.__func__, args)