summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-04-12 15:31:37 +0200
committerClaude Paroz <claude@2xlibre.net>2014-04-12 15:35:11 +0200
commita6eda3a5fc524333b476deed5057ee9803d91108 (patch)
treec0b477f8bc79209c32274845e8025b453d93d47a /tests
parentd9f8cc12aeeb5309139a79d9b613fa405ebed36e (diff)
[1.7.x] Also allowed a non-overridden setting to be deleted
Refs #20032, #18824. Thanks ztorstri at gmail.com for the report. Backport of 3417ba0309 from master.
Diffstat (limited to 'tests')
-rw-r--r--tests/settings_tests/tests.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py
index 754fdd32ab..6b2ca3e0a5 100644
--- a/tests/settings_tests/tests.py
+++ b/tests/settings_tests/tests.py
@@ -232,10 +232,15 @@ class SettingsTests(TestCase):
Allow deletion of a setting in an overridden settings set (#18824)
"""
previous_i18n = settings.USE_I18N
+ previous_l10n = settings.USE_L10N
with self.settings(USE_I18N=False):
del settings.USE_I18N
self.assertRaises(AttributeError, getattr, settings, 'USE_I18N')
+ # Should also work for a non-overridden setting
+ del settings.USE_L10N
+ self.assertRaises(AttributeError, getattr, settings, 'USE_L10N')
self.assertEqual(settings.USE_I18N, previous_i18n)
+ self.assertEqual(settings.USE_L10N, previous_l10n)
def test_override_settings_nested(self):
"""