summaryrefslogtreecommitdiff
path: root/tests/servers
diff options
context:
space:
mode:
Diffstat (limited to 'tests/servers')
-rw-r--r--tests/servers/tests.py15
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)