Ticket #14319: new_test_signals_patch.diff

django/test/simple.py

@@ -7 +7 @@
 from django.test import _doctest as doctest
 from django.test.utils import setup_test_environment, teardown_test_environment
 from django.test.testcases import OutputChecker, DocTestRunner, TestCase
+from django.test.signals import test_setup, test_teardown
 
 # The module name for tests outside models.py
 TEST_MODULE = 'tests'
@@ -230 +231 @@
         self.failfast = failfast
 
     def setup_test_environment(self, **kwargs):
-        setup_test_environment()
+        test_setup.send(sender=self)
         settings.DEBUG = False
 
     def build_suite(self, test_labels, extra_tests=None, **kwargs):
@@ -284 +285 @@
             connection.creation.destroy_test_db(old_name, self.verbosity)
 
     def teardown_test_environment(self, **kwargs):
-        teardown_test_environment()
+        test_teardown.send(sender=self)
 
     def suite_result(self, suite, result, **kwargs):
         return len(result.failures) + len(result.errors)
@@ -308 +309 @@
 
         Returns the number of tests that failed.
         """
+        suite = self.build_suite(test_labels, extra_tests)
         self.setup_test_environment()
-        suite = self.build_suite(test_labels, extra_tests)
         old_config = self.setup_databases()
         result = self.run_suite(suite)
         self.teardown_databases(old_config)

django/test/signals.py

@@ -1 +1 @@
 from django.dispatch import Signal
 
 template_rendered = Signal(providing_args=["template", "context"])
+test_setup = Signal() 
+test_teardown = Signal()
+ No newline at end of file

django/test/utils.py

@@ -52 +52 @@
     return self.nodelist.render(context)
 
 
-def setup_test_environment():
+def setup_test_environment(**kwargs):
     """Perform any global pre-test setup. This involves:
 
         - Installing the instrumented test renderer
@@ -71 +71 @@
     mail.outbox = []
 
     deactivate()
+signals.test_setup.connect(setup_test_environment)
 
-def teardown_test_environment():
+def teardown_test_environment(**kwargs):
     """Perform any global post-test teardown. This involves:
 
         - Restoring the original test renderer
@@ -89 +90 @@
     del mail.original_email_backend
 
     del mail.outbox
+signals.test_teardown.connect(teardown_test_environment)
 
 def get_runner(settings):
     test_path = settings.TEST_RUNNER.split('.')

docs/ref/signals.txt

@@ -455 +455 @@
         The :class:`~django.template.Context` with which the template was
         rendered.
 
+test_setup
+----------
+
+.. data:: django.test.signals.test_setup
+   :module:
+
+.. versionadded:: 1.3
+
+Sent during global pre-test setup, just after applications have loaded and
+the test suite has been built. This signal is not emitted during normal
+operation.
+
+Arguments sent with this signal:
+
+    sender
+        The :class:`~django.test.simple.DjangoTestSuiteRunner` object.
+
+test_teardown
+-------------
+
+.. data:: django.test.signals.test_teardown
+   :module:
+
+.. versionadded:: 1.3
+
+Sent during global post-test breakdown. This signal is not emitted during
+normal operation.
+
+Arguments sent with this signal:
+
+    sender
+        The :class:`~django.test.simple.DjangoTestSuiteRunner` object.
+
 Database Wrappers
 =================