diff --git a/django/test/testcases.py b/django/test/testcases.py index 2ca82d7536..d2c1735763 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -1068,12 +1068,14 @@ class LiveServerThread(threading.Thread): self.error = e self.is_ready.set() - def join(self, timeout=None): + def terminate(self): + """ + Shuts down live WSGI server. + """ if hasattr(self, 'httpd'): # Stop the WSGI server self.httpd.shutdown() self.httpd.server_close() - super(LiveServerThread, self).join(timeout) class LiveServerTestCase(TransactionTestCase): @@ -1153,6 +1155,7 @@ class LiveServerTestCase(TransactionTestCase): # reasons has raised an exception. if hasattr(cls, 'server_thread'): # Terminate the live server's thread + cls.server_thread.terminate() cls.server_thread.join() # Restore sqlite connections' non-sharability