Rev 5253: Clarify some iable/method names in the test servers. in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5253
revision-id: v.ladeuil+lp at free.fr-20100529155356-1hn89tooo4jq2b1l
parent: v.ladeuil+lp at free.fr-20100526164855-qgv59y2ex11ztkwy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: propagate-exceptions
timestamp: Sat 2010-05-29 17:53:56 +0200
message:
  Clarify some iable/method names in the test servers.
  
  * bzrlib/tests/stub_sftp.py:
  (SocketListener.__init__): '_connection_callback is more explicit
  than '_callback'.
  (SFTPServer._run_server_entry): Mention that SocketDelay is
  probably ineffective for the connections themselves.
  (SFTPServer._run_server): 'ready' is more explicit than 'event'.
  
  * bzrlib/tests/http_server.py:
  (HttpServer.run_server): 'run_server' is more explicit than
  http_start.
-------------- next part --------------
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py	2010-05-26 16:48:55 +0000
+++ b/bzrlib/tests/http_server.py	2010-05-29 15:53:56 +0000
@@ -624,7 +624,7 @@
             self.host, self.port = self._httpd.server_address
         return self._httpd
 
-    def _http_start(self, started):
+    def run_server(self, started):
         """Server thread main entry point. """
         server = self._get_httpd()
         self._http_base_url = '%s://%s:%s/' % (self._url_protocol,
@@ -670,7 +670,7 @@
         # Create the server thread
         started = threading.Event()
         self._http_thread = test_server.ThreadWithException(
-            event=started, target=self._http_start, args=(started,))
+            event=started, target=self.run_server, args=(started,))
         self._http_thread.start()
         # Wait for the server thread to start (i.e release the lock)
         started.wait()

=== modified file 'bzrlib/tests/stub_sftp.py'
--- a/bzrlib/tests/stub_sftp.py	2010-05-25 12:47:13 +0000
+++ b/bzrlib/tests/stub_sftp.py	2010-05-29 15:53:56 +0000
@@ -264,9 +264,9 @@
 
 class SocketListener(threading.Thread):
 
-    def __init__(self, callback):
+    def __init__(self, connection_callback):
         threading.Thread.__init__(self)
-        self._callback = callback
+        self._connection_callback = connection_callback
         self._socket = socket.socket()
         self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self._socket.bind(('localhost', 0))
@@ -298,7 +298,8 @@
                     self, s)
                 # because the loopback socket is inline, and transports are
                 # never explicitly closed, best to launch a new thread.
-                threading.Thread(target=self._callback, args=(s,)).start()
+                threading.Thread(target=self._connection_callback,
+                                 args=(s,)).start()
             except socket.error, x:
                 sys.excepthook(*sys.exc_info())
                 trace.warning('Socket error during accept() '
@@ -417,6 +418,9 @@
         decorator.
         """
         if self.add_latency > 0.000001:
+            # FIXME: We appear to use SocketDelay for the server socket only, I
+            # don't think that gets magically propagated to client
+            # sockets... -- vila 20100526
             sock = SocketDelay(sock, self.add_latency)
         return self._run_server(sock)
 
@@ -432,9 +436,9 @@
         ssh_server.set_subsystem_handler('sftp', paramiko.SFTPServer,
                                          StubSFTPServer, root=self._root,
                                          home=self._server_homedir)
-        event = threading.Event()
-        ssh_server.start_server(event, server)
-        event.wait(5.0)
+        ready = threading.Event()
+        ssh_server.start_server(ready, server)
+        ready.wait(5.0)
 
     def start_server(self, backing_server=None):
         # XXX: TODO: make sftpserver back onto backing_server rather than local