Ticket #17895: 17895.diff

docs/ref/signals.txt

@@ -477 +477 @@
 .. data:: django.test.signals.setting_changed
    :module:
 
-Sent when some :ref:`settings are overridden <overriding-settings>` with the
+Sent when the value of a setting is changed with the
 :meth:`django.test.TestCase.setting` context manager or the
 :func:`django.test.utils.override_settings` decorator/context manager.
 
@@ -492 +492 @@
 ``value``
     The new setting value.
 
+``state``
+    ``"pre"`` when the setting is set to a new value, ``"post"`` when it's
+    reset to its original value.
+
 template_rendered
 -----------------
 

django/test/utils.py

@@ -167 +167 @@
     delattr(loader, RESTORE_LOADERS_ATTR)
 
 
-class OverrideSettingsHolder(UserSettingsHolder):
-    """
-    A custom setting holder that sends a signal upon change.
-    """
-    def __setattr__(self, name, value):
-        UserSettingsHolder.__setattr__(self, name, value)
-        setting_changed.send(sender=self.__class__, setting=name, value=value)
-
-
 class override_settings(object):
     """
     Acts as either a decorator, or a context manager. If it's a decorator it
@@ -215 +206 @@
         return inner
 
     def enable(self):
-        override = OverrideSettingsHolder(settings._wrapped)
+        override = UserSettingsHolder(settings._wrapped)
         for key, new_value in self.options.items():
             setattr(override, key, new_value)
         settings._wrapped = override
+        for key, new_value in self.options.items():
+            setting_changed.send(sender=settings._wrapped.__class__,
+                                 setting=key, value=new_value, state='pre')
 
     def disable(self):
         settings._wrapped = self.wrapped
+        for key in self.options:
+            new_value = getattr(settings, key, None)
+            setting_changed.send(sender=settings._wrapped.__class__,
+                                 setting=key, value=new_value, state='post')
+

tests/regressiontests/settings_tests/tests.py

@@ -76 +76 @@
 
 testvalue = None
 
-def signal_callback(sender, setting, value, **kwargs):
+def signal_callback(sender, setting, value, state, **kwargs):
     if setting == 'TEST':
         global testvalue
-        testvalue = value
+        testvalue = (value, state)
 
 signals.setting_changed.connect(signal_callback)
 
@@ -131 +131 @@
     def test_signal_callback_context_manager(self):
         self.assertRaises(AttributeError, getattr, settings, 'TEST')
         with self.settings(TEST='override'):
-            self.assertEqual(testvalue, 'override')
+            self.assertEqual(testvalue, ('override', 'pre'))
+        self.assertEqual(testvalue, (None, 'post'))
 
     @override_settings(TEST='override')
     def test_signal_callback_decorator(self):
-        self.assertEqual(testvalue, 'override')
+        self.assertEqual(testvalue, ('override', 'pre'))
 
     #
     # Regression tests for #10130: deleting settings.