summaryrefslogtreecommitdiff
path: root/tests/servers
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2018-07-12 00:12:20 -0400
committerTim Graham <timograham@gmail.com>2019-01-10 19:11:21 -0500
commit8c775391b78b2a4a2b57c5e89ed4888f36aada4b (patch)
tree3daeb3ef031be73079bd56e7c83f0f8f974d8f60 /tests/servers
parent647be06538474078ac79c1338f02f5d9bc56a79b (diff)
Refs #28478 -- Deprecated TestCase's allow_database_queries and multi_db in favor of databases.
Diffstat (limited to 'tests/servers')
-rw-r--r--tests/servers/tests.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/servers/tests.py b/tests/servers/tests.py
index 5917e30d24..7f75b85d6c 100644
--- a/tests/servers/tests.py
+++ b/tests/servers/tests.py
@@ -209,8 +209,7 @@ class LiveServerPort(LiveServerBase):
"Acquired duplicate server addresses for server threads: %s" % self.live_server_url
)
finally:
- if hasattr(TestCase, 'server_thread'):
- TestCase.server_thread.terminate()
+ TestCase.tearDownClass()
def test_specified_port_bind(self):
"""LiveServerTestCase.port customizes the server's port."""
@@ -227,8 +226,7 @@ class LiveServerPort(LiveServerBase):
'Did not use specified port for LiveServerTestCase thread: %s' % TestCase.port
)
finally:
- if hasattr(TestCase, 'server_thread'):
- TestCase.server_thread.terminate()
+ TestCase.tearDownClass()
class LiverServerThreadedTests(LiveServerBase):