Rev 5271: Merge sftp-leaks into catch-them-all in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5271 [merge]
revision-id: v.ladeuil+lp at free.fr-20100612150018-vgjduv1uano3ahok
parent: v.ladeuil+lp at free.fr-20100611165829-2z46a6lc2i2gc8na
parent: v.ladeuil+lp at free.fr-20100612150017-qits7s9sf2ai0skm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: catch-them-all
timestamp: Sat 2010-06-12 17:00:18 +0200
message:
  Merge sftp-leaks into catch-them-all
modified:
  bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_server.py    test_server.py-20100209163834-im1ozfuenfmqaa2m-1
-------------- next part --------------
=== modified file 'bzrlib/tests/http_utils.py'
--- a/bzrlib/tests/http_utils.py	2010-06-11 16:31:34 +0000
+++ b/bzrlib/tests/http_utils.py	2010-06-12 14:56:23 +0000
@@ -28,13 +28,14 @@
     errors,
     osutils,
     tests,
-    )
-from bzrlib.smart import medium, protocol
+    transport,
+    )
+from bzrlib.smart import (
+    medium,
+    protocol,
+    )
 from bzrlib.tests import http_server
-from bzrlib.transport import (
-    chroot,
-    get_transport,
-    )
+from bzrlib.transport import chroot
 
 
 class HTTPServerWithSmarts(http_server.HttpServer):
@@ -56,11 +57,12 @@
 
     def do_POST(self):
         """Hand the request off to a smart server instance."""
-        backing = get_transport(self.server.test_case_server._home_dir)
+        backing = transport.get_transport(
+            self.server.test_case_server._home_dir)
         chroot_server = chroot.ChrootServer(backing)
         chroot_server.start_server()
         try:
-            t = get_transport(chroot_server.get_url())
+            t = transport.get_transport(chroot_server.get_url())
             self.do_POST_inner(t)
         finally:
             chroot_server.stop_server()
@@ -157,7 +159,7 @@
         return self._adjust_url(base, relpath)
 
     def get_secondary_transport(self, relpath=None):
-        t = get_transport(self.get_secondary_url(relpath))
+        t = transport.get_transport(self.get_secondary_url(relpath))
         self.assertTrue(t.is_readonly())
         return t
 
@@ -261,7 +263,7 @@
         return self._adjust_url(base, relpath)
 
    def get_old_transport(self, relpath=None):
-        t = get_transport(self.get_old_url(relpath))
+        t = transport.get_transport(self.get_old_url(relpath))
         self.assertTrue(t.is_readonly())
         return t
 
@@ -270,7 +272,7 @@
         return self._adjust_url(base, relpath)
 
    def get_new_transport(self, relpath=None):
-        t = get_transport(self.get_new_url(relpath))
+        t = transport.get_transport(self.get_new_url(relpath))
         self.assertTrue(t.is_readonly())
         return t
 

=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2010-06-11 16:31:34 +0000
+++ b/bzrlib/tests/test_http.py	2010-06-12 14:56:23 +0000
@@ -1406,8 +1406,8 @@
 
         self.old_transport = self.get_old_transport()
 
-    def get_a(self, transport):
-        return transport.get('a')
+    def get_a(self, t):
+        return t.get('a')
 
     def test_no_redirection(self):
         t = self.get_new_transport()

=== 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()