From eabc3b6c8dd67e9ff49da9f2f41cc653898cd0a1 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Fri, 20 Dec 2013 11:04:58 +0100 Subject: Set stacklevel for the override_settings warning. Refs #19031. --- tests/settings_tests/tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py index 3597982457..b148887e34 100644 --- a/tests/settings_tests/tests.py +++ b/tests/settings_tests/tests.py @@ -227,13 +227,13 @@ class TestComplexSettingOverride(TestCase): with warnings.catch_warnings(record=True) as w: warnings.simplefilter("always") - override = override_settings(TEST_WARN='override') - override.enable() - self.assertEqual('override', settings.TEST_WARN) - override.disable() + with override_settings(TEST_WARN='override'): + self.assertEqual(settings.TEST_WARN, 'override') self.assertEqual(len(w), 1) - self.assertEqual('Overriding setting TEST_WARN can lead to unexpected behaviour.', str(w[-1].message)) + self.assertEqual(w[0].filename, __file__) + self.assertEqual(str(w[0].message), + 'Overriding setting TEST_WARN can lead to unexpected behaviour.') class UniqueSettingsTests(TestCase): -- cgit v1.3