Ticket #14319: new_test_signals_patch_3.diff

docs/ref/signals.txt

@@ -504 +504 @@
     The :class:`~django.template.Context` with which the template was
     rendered.
 
+test_setup
+----------
+
+.. data:: django.test.signals.test_setup
+   :module:
+
+.. versionadded:: 1.4
+
+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.4
+
+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
 =================
 

django/test/simple.py

@@ -5 +5 @@
 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
 from django.utils import unittest
 
 __all__ = ('DjangoTestRunner', 'DjangoTestSuiteRunner', 'run_tests')
@@ -226 +227 @@
         self.failfast = failfast
 
     def setup_test_environment(self, **kwargs):
-        setup_test_environment()
+        test_setup.send(sender=self)
         settings.DEBUG = False
         unittest.installHandler()
 
@@ -324 +325 @@
 
     def teardown_test_environment(self, **kwargs):
         unittest.removeHandler()
-        teardown_test_environment()
+        test_teardown.send(sender=self) 
 
     def suite_result(self, suite, result, **kwargs):
         return len(result.failures) + len(result.errors)
@@ -348 +349 @@
 
         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

@@ -3 +3 @@
 template_rendered = Signal(providing_args=["template", "context"])
 
 setting_changed = Signal(providing_args=["setting", "value"])
+
+test_setup = Signal() 
+test_teardown = Signal()

django/test/utils.py

@@ -7 +7 @@
 from django.conf import settings, UserSettingsHolder
 from django.core import mail
 from django.core.mail.backends import locmem
-from django.test.signals import template_rendered, setting_changed
+from django.test.signals import template_rendered, setting_changed, test_setup, test_teardown
 from django.template import Template, loader, TemplateDoesNotExist
 from django.template.loaders import cached
 from django.utils.translation import deactivate
@@ -66 +66 @@
     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
@@ -82 +82 @@
     mail.outbox = []
 
     deactivate()
+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
@@ -98 +98 @@
     del mail.original_email_backend
 
     del mail.outbox
+test_teardown.connect(teardown_test_environment)
 
 
 def get_warnings_state():