Ticket #18417: 18417-2.diff

django/test/testcases.py

@@ -241 +241 @@
 
 
 class SimpleTestCase(ut2.TestCase):
+    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().
+        """
+        testMethod = getattr(self, self._testMethodName)
+        skipped = (getattr(self.__class__, "__unittest_skip__", False) or
+            getattr(testMethod, "__unittest_skip__", False))
+
+        if not skipped:
+            try:
+                self._pre_setup()
+            except (KeyboardInterrupt, SystemExit):
+                raise
+            except Exception:
+                result.addError(self, sys.exc_info())
+                return
+        super(SimpleTestCase, self).__call__(result)
+        if not skipped:
+            try:
+                self._post_teardown()
+            except (KeyboardInterrupt, SystemExit):
+                raise
+            except Exception:
+                result.addError(self, sys.exc_info())
+                return
+
+    def _pre_setup(self):
+        pass
+
+    def _post_teardown(self):
+        pass
+
     def save_warnings_state(self):
         """
         Saves the state of the warnings module
@@ -412 +446 @@
               ROOT_URLCONF with it.
             * Clearing the mail test outbox.
         """
+        self.client = self.client_class()
         self._fixture_setup()
         self._urlconf_setup()
         mail.outbox = []
@@ -453 +488 @@
             settings.ROOT_URLCONF = self.urls
             clear_url_caches()
 
-    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().
-        """
-        testMethod = getattr(self, self._testMethodName)
-        skipped = (getattr(self.__class__, "__unittest_skip__", False) or
-            getattr(testMethod, "__unittest_skip__", False))
-
-        if not skipped:
-            self.client = self.client_class()
-            try:
-                self._pre_setup()
-            except (KeyboardInterrupt, SystemExit):
-                raise
-            except Exception:
-                result.addError(self, sys.exc_info())
-                return
-        super(TransactionTestCase, self).__call__(result)
-        if not skipped:
-            try:
-                self._post_teardown()
-            except (KeyboardInterrupt, SystemExit):
-                raise
-            except Exception:
-                result.addError(self, sys.exc_info())
-                return
-
     def _post_teardown(self):
         """ Performs any post-test things. This includes:
 

django/test/utils.py

@@ -187 +187 @@
         self.disable()
 
     def __call__(self, test_func):
-        from django.test import TransactionTestCase
-        if isinstance(test_func, type) and issubclass(test_func, TransactionTestCase):
+        from django.test import SimpleTestCase
+        if isinstance(test_func, type):
+            if not issubclass(test_func, SimpleTestCase):
+                raise Exception(
+                    "Only subclasses of Django SimpleTestCase can be decorated "
+                    "with override_settings")
             original_pre_setup = test_func._pre_setup
             original_post_teardown = test_func._post_teardown
 

tests/regressiontests/settings_tests/tests.py

@@ -4 +4 @@
 from django.conf import settings, global_settings
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpRequest
-from django.test import TransactionTestCase, TestCase, signals
+from django.test import SimpleTestCase, TransactionTestCase, TestCase, signals
 from django.test.utils import override_settings
+from django.utils import unittest, six
 
 
 @override_settings(TEST='override')
@@ -67 +68 @@
             self.fail()
 
 
-class SettingGetter(object):
-    def __init__(self):
-        self.test = getattr(settings, 'TEST', 'undefined')
-
-
 class SettingsTests(TestCase):
     def setUp(self):
         self.testvalue = None
@@ -122 +118 @@
         self.assertRaises(AttributeError, getattr, settings, 'TEST')
 
     def test_class_decorator(self):
-        self.assertEqual(SettingGetter().test, 'undefined')
-        DecoratedSettingGetter = override_settings(TEST='override')(SettingGetter)
-        self.assertEqual(DecoratedSettingGetter().test, 'override')
-        self.assertRaises(AttributeError, getattr, settings, 'TEST')
+        # SimpleTestCase can be decorated by override_settings, but not ut.TestCase
+        class SimpleTestCaseSubclass(SimpleTestCase):
+            pass
+
+        class UnittestTestCaseSubclass(unittest.TestCase):
+            pass
+
+        decorated = override_settings(TEST='override')(SimpleTestCaseSubclass)
+        self.assertIsInstance(decorated, type)
+        self.assertTrue(issubclass(decorated, SimpleTestCase))
+
+        with six.assertRaisesRegex(self, Exception,
+                "Only subclasses of Django SimpleTestCase*"):
+            decorated = override_settings(TEST='override')(UnittestTestCaseSubclass)
 
     def test_signal_callback_context_manager(self):
         self.assertRaises(AttributeError, getattr, settings, 'TEST')