Rev 5285: Merge propagate-exceptions into http-leaks in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5285 [merge]
revision-id: v.ladeuil+lp at free.fr-20100612150012-icj4e01r8c1nrvbf
parent: v.ladeuil+lp at free.fr-20100612145623-6i8v3e7ee0etr8l5
parent: v.ladeuil+lp at free.fr-20100612112934-49gyqx2q818ok2i4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Sat 2010-06-12 17:00:12 +0200
message:
  Merge propagate-exceptions into http-leaks
modified:
  bzrlib/tests/test_server.py    test_server.py-20100209163834-im1ozfuenfmqaa2m-1
-------------- next part --------------
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-06-11 16:58:21 +0000
+++ b/bzrlib/tests/test_server.py	2010-06-12 15:00:12 +0000
@@ -262,6 +262,9 @@
         self.exception = None
         self.ignored_exceptions = None # see set_ignored_exceptions
 
+    # compatibility thunk for python-2.4 and python-2.5...
+    name = property(threading.Thread.getName, threading.Thread.setName)
+
     def set_event(self, event):
         self.ready = event
 
@@ -560,15 +563,15 @@
         self.server = self.create_server()
         self._server_thread = ThreadWithException(
             event=self.server.started,
-            name='(%s:%s)' % (self.host, self.port),
             target=self.run_server)
         self._server_thread.start()
         # Wait for the server thread to start (i.e release the lock)
         self.server.started.wait()
-        if debug_threads():
-            print 'Server thread %s started' % (self._server_thread.name,)
         # Get the real address, especially the port
         self.host, self.port = self.server.server_address
+        self._server_thread.name = self.server.server_address
+        if debug_threads():
+            print 'Server thread %s started' % (self._server_thread.name,)
         # If an exception occured during the server start, it will get raised,
         # otherwise, the server is blocked on its accept() call.
         self._server_thread.pending_exception()