diff options
| author | Thomas Chaumeny <t.chaumeny@gmail.com> | 2014-10-18 20:03:10 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-03 14:14:39 -0500 |
| commit | d89f56dc4d03f6bf6602536b8b62602ec0d46d2f (patch) | |
| tree | ee089210ebb576d286abbe2bee51db042ee6ee48 /tests/servers | |
| parent | 8b77b64f1cf878b100d1d2001c8a73938ea3e1ed (diff) | |
Fixed #21281 -- Made override_settings act at class level when used as a TestCase decorator.
Diffstat (limited to 'tests/servers')
| -rw-r--r-- | tests/servers/tests.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/tests/servers/tests.py b/tests/servers/tests.py index 2331a0ddce..50b2cafe1a 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -27,7 +27,7 @@ TEST_SETTINGS = { } -@override_settings(ROOT_URLCONF='servers.urls') +@override_settings(ROOT_URLCONF='servers.urls', **TEST_SETTINGS) class LiveServerBase(LiveServerTestCase): available_apps = [ @@ -38,19 +38,6 @@ class LiveServerBase(LiveServerTestCase): ] fixtures = ['testdata.json'] - @classmethod - def setUpClass(cls): - # Override settings - cls.settings_override = override_settings(**TEST_SETTINGS) - cls.settings_override.enable() - super(LiveServerBase, cls).setUpClass() - - @classmethod - def tearDownClass(cls): - # Restore original settings - cls.settings_override.disable() - super(LiveServerBase, cls).tearDownClass() - def urlopen(self, url): return urlopen(self.live_server_url + url) |