Ticket #7884: result_test_runner_r8055.diff

django/test/simple.py

@@ -100 +100 @@
     else: # label is app.TestClass.test_method
         return TestClass(parts[2])
 
-def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]):
+def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[], test_result=None):
     """
     Run the unit tests for all the test labels in the provided list.
     Labels must be of the form:
@@ -117 +117 @@
     A list of 'extra' tests may also be provided; these tests
     will be added to the test suite.
     
-    Returns the number of tests that failed.
+    If a unittest.TestResult is provided, tests will instead be run and
+    the TestResult will be updated with results.
+    
+    Returns the number of tests that failed or errored
     """
     setup_test_environment()
     
@@ -140 +143 @@
 
     old_name = settings.DATABASE_NAME
     create_test_db(verbosity, autoclobber=not interactive)
-    result = unittest.TextTestRunner(verbosity=verbosity).run(suite)
+    if test_result:
+        result = ResultTestRunner(test_result).run(suite)
+    else:
+        result = unittest.TextTestRunner(verbosity=verbosity).run(suite)
     destroy_test_db(old_name, verbosity)
     
     teardown_test_environment()
     
     return len(result.failures) + len(result.errors)
+
+class ResultTestRunner(object):
+    """
+    TestRunner that uses supplied TestResult to run tests and report results.
+    """
+    
+    def __init__(self, test_result):
+        self.test_result = test_result
+    
+    def run(self, test):
+        results = self.test_result
+        for t in test:
+            t.run(results)
+        return results

docs/testing.txt

@@ -989 +989 @@
 By convention, a test runner should be called ``run_tests``. The only strict
 requirement is that it has the same arguments as the Django test runner:
 
-``run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[])``
+``run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[], test_result=None)``
 
     ``test_labels`` is a list of strings describing the tests to be run. A test
     label can take one of three forms:
@@ -1014 +1014 @@
     ``extra_tests`` is a list of extra ``TestCase`` instances to add to the
     suite that is executed by the test runner. These extra tests are run
     in addition to those discovered in the modules listed in ``module_list``.
+    
+    If ``test_result`` is supplied a ``unittest.TestResult``, then tests run
+    will save results in this ``TestResult``.
 
     This method should return the number of tests that failed.