Commit 1830f504 authored by Anssi Kääriäinen's avatar Anssi Kääriäinen
Browse files

Merge pull request #1743 from unaizalakain/ticket_21172 

Fixed #21172 -- have LiveServerThread follow the semantics of threading.Thread.join()
parents a8e84521 cb32175b

django/test/testcases.py

+5 −2
Original line number Diff line number Diff line
@@ -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