p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed ticket #21172 

LiveServerThread.join() now behaves like threading.Thread.join().
LiveServerThread.terminate() is instead used to ask live http server to
terminate and close.
This commit is contained in:
Unai Zalakain 2013-10-02 15:27:38 +02:00
parent 9b95fa7777
commit cb32175bfd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/test/testcases.py
View File

@ -1063,12 +1063,14 @@ class LiveServerThread(threading.Thread):
self.error = e self.error = e
self.is_ready.set() self.is_ready.set()
def join(self, timeout=None): def terminate(self):
"""
Shuts down live WSGI server.
"""
if hasattr(self, 'httpd'): if hasattr(self, 'httpd'):
# Stop the WSGI server # Stop the WSGI server
self.httpd.shutdown() self.httpd.shutdown()
self.httpd.server_close() self.httpd.server_close()
super(LiveServerThread, self).join(timeout)
class LiveServerTestCase(TransactionTestCase): class LiveServerTestCase(TransactionTestCase):
@ -1148,6 +1150,7 @@ class LiveServerTestCase(TransactionTestCase):
# reasons has raised an exception. # reasons has raised an exception.
if hasattr(cls, 'server_thread'): if hasattr(cls, 'server_thread'):
# Terminate the live server's thread # Terminate the live server's thread
cls.server_thread.terminate()
cls.server_thread.join() cls.server_thread.join()
# Restore sqlite connections' non-sharability # Restore sqlite connections' non-sharability