Ticket #3971: 3971.diff

django/test/simple.py

@@ -3 +3 @@
 from django.test import _doctest as doctest
 from django.test.utils import setup_test_environment, teardown_test_environment
 from django.test.utils import create_test_db, destroy_test_db
-from django.test.testcases import OutputChecker, DocTestRunner
+from django.test.testcases import OutputChecker, DocTestRunner, TextTestRunner
 
 # The module name for tests outside models.py
 TEST_MODULE = 'tests'
@@ -83 +83 @@
 
     old_name = settings.DATABASE_NAME
     create_test_db(verbosity)
-    result = unittest.TextTestRunner(verbosity=verbosity).run(suite)
+    result = TextTestRunner(verbosity=verbosity).run(suite)
     destroy_test_db(old_name, verbosity)
     
     teardown_test_environment()

django/test/testcases.py

@@ -33 +33 @@
         from django.db import transaction
         transaction.rollback_unless_managed()
 
-class TestCase(unittest.TestCase):    
+class TestCase(unittest.TestCase):
     def _pre_setup(self):
         """Perform any pre-test setup. This includes:
         
@@ -47 +47 @@
             management.load_data(self.fixtures, verbosity=0)
         mail.outbox = []
 
-    def __call__(self, result=None):
-        """
-        Wrapper around default __call__ method to perform common Django test
-        set up. This means that user-defined Test Cases aren't required to
-        include a call to super().setUp().
-        """
-        self.client = Client()
-        self._pre_setup()
-        super(TestCase, self).__call__(result)
-
     def assertRedirects(self, response, expected_path, status_code=302, target_status_code=200):
         """Assert that a response redirected to a specific URL, and that the
         redirect URL can be loaded.
@@ -146 +136 @@
         elif response.template:
             self.assertNotEqual(template_name, response.template.name,
                 "Template '%s' was used unexpectedly in rendering the response" % template_name)
-        
+
+class _TextTestResult(unittest._TextTestResult):
+    def startTest(self, test):
+        super(_TextTestResult, self).startTest(test)
+        if isinstance(test, TestCase):
+            test._pre_setup()
+
+class TextTestRunner(unittest.TextTestRunner):
+    def _makeResult(self):
+        return _TextTestResult(self.stream, self.descriptions, self.verbosity)
+