mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #21281 -- Made override_settings act at class level when used as a TestCase decorator.

Browse Source
This commit is contained in:
Thomas Chaumeny
2014-10-18 20:03:10 +02:00
committed by Tim Graham
parent 8b77b64f1c
commit d89f56dc4d
9 changed files with 73 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/servers/tests.py
View File

@@ -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)