summaryrefslogtreecommitdiff
path: root/tests/servers
diff options
context:
space:
mode:
authorOliver Beattie <oliver@obeattie.com>2013-04-19 10:44:47 +0100
committerClaude Paroz <claude@2xlibre.net>2013-06-21 16:57:47 +0200
commit552a90b44456f24de228a6c7cd916c040787cf22 (patch)
treebba505c4ed2e8cb37966d79d4b014bd3893e8ca4 /tests/servers
parent7314007c5bf57b9184c0bd6a8246582dd2cb8179 (diff)
Fixed #20290 -- Allow override_settings to be nested
Refactored override_settings to store the underlying settings._wrapped value seen at runtime, not instantiation time.
Diffstat (limited to 'tests/servers')
-rw-r--r--tests/servers/tests.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/servers/tests.py b/tests/servers/tests.py
index 3377793d68..be74afe820 100644
--- a/tests/servers/tests.py
+++ b/tests/servers/tests.py
@@ -96,6 +96,11 @@ class LiveServerAddress(LiveServerBase):
del os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS']
@classmethod
+ def tearDownClass(cls):
+ # skip it, as setUpClass doesn't call its parent either
+ pass
+
+ @classmethod
def raises_exception(cls, address, exception):
os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS'] = address
try: