Rev 5301: Fixed as per lifeless suggestion. in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5301
revision-id: v.ladeuil+lp at free.fr-20100701144806-7qrkorgronz3my70
parent: v.ladeuil+lp at free.fr-20100701080433-z32vd29j5k2v74oz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: smart-server-leaks
timestamp: Thu 2010-07-01 16:48:06 +0200
message:
  Fixed as per lifeless suggestion.
  
  * bzrlib/smart/server.py:
  (SmartTCPServer.start_server): Renamed from _create_server_socket.
-------------- next part --------------
=== modified file 'bzrlib/smart/server.py'
--- a/bzrlib/smart/server.py	2010-06-29 16:11:18 +0000
+++ b/bzrlib/smart/server.py	2010-07-01 14:48:06 +0000
@@ -65,8 +65,7 @@
         self.backing_transport = backing_transport
         self.root_client_path = root_client_path
 
-    # FIXME: Needs to be public and be called start_server ? -- vila 20100624
-    def _create_server_socket(self, host, port):
+    def start_server(self, host, port):
         """Create the server listening socket.
 
         :param host: Name of the interface to listen on.
@@ -195,7 +194,6 @@
         connection_thread.start()
         return connection_thread
 
-    # FIXME: Not needed if we use SmartTCPServer_for_testing ? -- vila 20100624
     def start_background_thread(self, thread_name_suffix=''):
         self._started.clear()
         self._server_thread = threading.Thread(None,
@@ -346,7 +344,7 @@
             if port is None:
                 port = medium.BZR_DEFAULT_PORT
             smart_server = SmartTCPServer(self.transport)
-            smart_server._create_server_socket(host, port)
+            smart_server.start_server(host, port)
             trace.note('listening on port: %s' % smart_server.port)
         self.smart_server = smart_server
 

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2010-07-01 08:04:33 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2010-07-01 14:48:06 +0000
@@ -995,7 +995,7 @@
 class SmartTCPTests(tests.TestCase):
     """Tests for connection/end to end behaviour using the TCP server.
 
-    All of these tests are run with a server running on another thread serving
+    All of these tests are run with a server running in another thread serving
     a MemoryTransport, and a connection to it already open.
 
     the server is obtained by calling self.start_server(readonly=False).
@@ -1009,7 +1009,7 @@
         # NB: Tests using this fall into two categories: tests of the server,
         # tests wanting a server. The latter should be updated to use
         # self.vfs_transport_factory etc.
-        if not backing_transport:
+        if backing_transport is None:
             mem_server = memory.MemoryServer()
             mem_server.start_server()
             self.addCleanup(mem_server.stop_server)
@@ -1023,7 +1023,7 @@
             self.backing_transport = transport.get_transport(
                 "readonly+" + self.backing_transport.abspath('.'))
         self.server = server.SmartTCPServer(self.backing_transport)
-        self.server._create_server_socket('127.0.0.1', 0)
+        self.server.start_server('127.0.0.1', 0)
         self.server.start_background_thread('-' + self.id())
         self.transport = remote.RemoteTCPTransport(self.server.get_url())
         self.addCleanup(self.tearDownServer)
@@ -1044,10 +1044,9 @@
     def test_server_setup_teardown(self):
         """It should be safe to teardown the server with no requests."""
         self.start_server()
-        server = self.server
-        transport = remote.RemoteTCPTransport(self.server.get_url())
+        t = remote.RemoteTCPTransport(self.server.get_url())
         self.tearDownServer()
-        self.assertRaises(errors.ConnectionError, transport.has, '.')
+        self.assertRaises(errors.ConnectionError, t.has, '.')
 
     def test_server_closes_listening_sock_on_shutdown_after_request(self):
         """The server should close its listening socket when it's stopped."""
@@ -1057,8 +1056,8 @@
         self.tearDownServer()
         # if the listening socket has closed, we should get a BADFD error
         # when connecting, rather than a hang.
-        transport = remote.RemoteTCPTransport(server.get_url())
-        self.assertRaises(errors.ConnectionError, transport.has, '.')
+        t = remote.RemoteTCPTransport(server.get_url())
+        self.assertRaises(errors.ConnectionError, t.has, '.')
 
 
 class WritableEndToEndTests(SmartTCPTests):