Rev 4749: Tweak some more but we now hang in a new way on BSD variants :-/ in file:///home/vila/src/bzr/bugs/392127-thread-leak/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/392127-thread-leak/

------------------------------------------------------------
revno: 4749
revision-id: v.ladeuil+lp at free.fr-20091014092030-vrq9sofcm88t26dz
parent: v.ladeuil+lp at free.fr-20091013133920-moqwuq39nyzdudvf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 392127-thread-leak
timestamp: Wed 2009-10-14 11:20:30 +0200
message:
  Tweak some more but we now hang in a new way on BSD variants :-/
  
  * bzrlib/tests/http_server.py:
  (TestingHTTPServerMixin.shutdown): Fix typo.
  (TestingThreadingHTTPServer.shutdown_client): Don't check if
  thread is alive, we're allowed to join dead threads anyway.
-------------- next part --------------
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py	2009-10-12 15:54:32 +0000
+++ b/bzrlib/tests/http_server.py	2009-10-14 09:20:30 +0000
@@ -431,7 +431,7 @@
         # The server is listening for a last connection, let's give it:
         last_conn = None
         try:
-            last__conn = self.connect_socket()
+            last_conn = self.connect_socket()
         except socket.error, e:
             # But ignore connection errors as the point is to unblock the
             # server thread, it may happen that it's not blocked or even not
@@ -548,10 +548,9 @@
             # after the connection is inited. This could happne when the server
             # is shut down.
             sock, addr, thread = client
-            if thread.isAlive():
-                if 'threads' in tests.selftest_debug_flags:
-                    print 'Try    joining: %s' % (thread.name,)
-                self.join_thread(thread)
+            if 'threads' in tests.selftest_debug_flags:
+                print 'Try    joining: %s' % (thread.name,)
+            self.join_thread(thread)
 
     def server_bind(self):
         SocketServer.ThreadingTCPServer.server_bind(self)