Rev 5291: Fix the last remaining failures. in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5291
revision-id: v.ladeuil+lp at free.fr-20100618153627-2ceniy5w6f3zsmhw
parent: v.ladeuil+lp at free.fr-20100618142008-ra18rgm51i8fqryt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: smart-server-leaks
timestamp: Fri 2010-06-18 17:36:27 +0200
message:
  Fix the last remaining failures.
  
  * bzrlib/tests/test_server.py:
  (TestingSmartServer.serve): Run the hooks.
  (SmartTCPServer_for_testing.stop_server): Don't forget the chroot
  server.
  
  * bzrlib/tests/per_branch/test_push.py:
  (EmptyPushSmartEffortTests.setUp): Fix the issubclass check, the
  smart test server don't ihnerit directly from
  server.SmartTCPServer anymore.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_branch/test_push.py'
--- a/bzrlib/tests/per_branch/test_push.py	2010-02-23 07:43:11 +0000
+++ b/bzrlib/tests/per_branch/test_push.py	2010-06-18 15:36:27 +0000
@@ -382,8 +382,9 @@
 
     def setUp(self):
         # Skip some scenarios that don't apply to these tests.
-        if (self.transport_server is not None and
-            issubclass(self.transport_server, server.SmartTCPServer)):
+        if (self.transport_server is not None
+            and issubclass(self.transport_server,
+                           test_server.SmartTCPServer_for_testing)):
             raise tests.TestNotApplicable(
                 'Does not apply when remote backing branch is also '
                 'a smart branch')

=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-06-18 14:20:08 +0000
+++ b/bzrlib/tests/test_server.py	2010-06-18 15:36:27 +0000
@@ -643,8 +643,8 @@
         self.server._pending_exception(self._server_thread)
 
 
-class TestingSmartRequestHandler(SocketServer.BaseRequestHandler,
-                                 medium.SmartServerSocketStreamMedium):
+class TestingSmartConnectionHandler(SocketServer.BaseRequestHandler,
+                                    medium.SmartServerSocketStreamMedium):
 
     def __init__(self, request, client_address, server):
         medium.SmartServerSocketStreamMedium.__init__(
@@ -668,6 +668,14 @@
                                            request_handler_class)
         server.SmartTCPServer.__init__(self, backing_transport,
                                        root_client_path)
+    def serve(self):
+        # FIXME: No test are exercising the hooks for the test server
+        # -- vila 20100618
+        self.run_server_started_hooks()
+        try:
+            TestingThreadingTCPServer.serve(self)
+        finally:
+            self.run_server_stopped_hooks()
 
     def get_url(self):
         """Return the url of the server"""
@@ -687,7 +695,7 @@
         super(SmartTCPServer_for_testing, self).__init__(
                 (self.host, self.port),
                 TestingSmartServer,
-                TestingSmartRequestHandler)
+                TestingSmartConnectionHandler)
 
     def create_server(self):
         return self.server_class((self.host, self.port),
@@ -723,6 +731,10 @@
             self.chroot_server.get_url())
         super(SmartTCPServer_for_testing, self).start_server()
 
+    def stop_server(self):
+        super(SmartTCPServer_for_testing, self).stop_server()
+        self.chroot_server.stop_server()
+
     def get_backing_transport(self, backing_transport_server):
         """Get a backing transport from a server we are decorating."""
         return transport.get_transport(backing_transport_server.get_url())