Fixed #21263 -- Fixed issue with override_settings in inherited classes

When both parent and child classes are decorated with override_settings,
child class settings should take precedence.
Thanks Sephi for the report and Marc Tamlyn for the review.

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py
index a9503358a2..4a0c363c39 100644
--- a/tests/settings_tests/tests.py
+++ b/tests/settings_tests/tests.py
@@ -73,6 +73,16 @@ class ClassDecoratedTestCase(ClassDecoratedTestCaseSuper):
             self.fail()
 
 
+@override_settings(TEST='override-parent')
+class ParentDecoratedTestCase(TestCase):
+    pass
+
+@override_settings(TEST='override-child')
+class ChildDecoratedTestCase(ParentDecoratedTestCase):
+    def test_override_settings_inheritance(self):
+        self.assertEqual(settings.TEST, 'override-child')
+
+
 class SettingsTests(TestCase):
     def setUp(self):
         self.testvalue = None