1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Cleaned up several test cases, to better isolate state.

This commit is contained in:
Alex Gaynor
2012-09-07 13:43:51 -04:00
parent 72b8f8d73b
commit f47af9df1d
3 changed files with 59 additions and 64 deletions

View File

@@ -71,16 +71,18 @@ class SettingGetter(object):
def __init__(self):
self.test = getattr(settings, 'TEST', 'undefined')
testvalue = None
def signal_callback(sender, setting, value, **kwargs):
if setting == 'TEST':
global testvalue
testvalue = value
signals.setting_changed.connect(signal_callback)
class SettingsTests(TestCase):
def setUp(self):
self.testvalue = None
signals.setting_changed.connect(self.signal_callback)
def tearDown(self):
signals.setting_changed.disconnect(self.signal_callback)
def signal_callback(self, sender, setting, value, **kwargs):
if setting == 'TEST':
self.testvalue = value
def test_override(self):
settings.TEST = 'test'
@@ -128,12 +130,12 @@ class SettingsTests(TestCase):
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, None)
self.assertEqual(self.testvalue, 'override')
self.assertEqual(self.testvalue, None)
@override_settings(TEST='override')
def test_signal_callback_decorator(self):
self.assertEqual(testvalue, 'override')
self.assertEqual(self.testvalue, 'override')
#
# Regression tests for #10130: deleting settings.