Ticket #17011: override_settings_max_recursion_error.diff

tests/regressiontests/test_utils/tests.py

@@ -3 +3 @@
 from django.forms import EmailField
 from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
 from django.utils.unittest import skip
+from django.test.utils import override_settings
 
 from models import Person
 
@@ -150 +151 @@
         self.assertRaises(AssertionError, self.assertFieldOutput, EmailField, {'a@a.com': 'a@a.com'}, {'aaa': [u'Come on, gimme some well formatted data, dude.']})
 
 
+class OverrideSettingsTestsSuper(TestCase):
+    """
+    Dummy class for testing max recursion error in child class call to super()
+    """
+    def test_max_recursion_error(self):
+        pass
+
+
+@override_settings(FOO='bar')
+class OverrideSettingsTests(OverrideSettingsTestsSuper):
+    def test_max_recursion_error(self):
+        """
+        Overriding a method on a super class and then calling that method on
+        the super class triggers infinite recursion
+        """
+        try:
+            super(OverrideSettingsTests, self).test_max_recursion_error()
+        except RuntimeError, e:
+            self.fail()
+
+
 __test__ = {"API_TEST": r"""
 # Some checks of the doctest output normalizer.
 # Standard doctests do fairly