Rev 5293: Make sure the chroot server is shut down too. in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5293
revision-id: v.ladeuil+lp at free.fr-20100622090924-q6f8ckvn4nurj6li
parent: v.ladeuil+lp at free.fr-20100620111903-1arlwzhwd94eweuo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: smart-server-leaks
timestamp: Tue 2010-06-22 11:09:24 +0200
message:
  Make sure the chroot server is shut down too.
  
  * bzrlib/tests/test_server.py:
  (SmartTCPServer_for_testing.stop_server): Base class can raise an
  exception, be sure to shut down the chroot server in all cases.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-06-18 15:36:27 +0000
+++ b/bzrlib/tests/test_server.py	2010-06-22 09:09:24 +0000
@@ -732,8 +732,10 @@
         super(SmartTCPServer_for_testing, self).start_server()
 
     def stop_server(self):
-        super(SmartTCPServer_for_testing, self).stop_server()
-        self.chroot_server.stop_server()
+        try:
+            super(SmartTCPServer_for_testing, self).stop_server()
+        finally:
+            self.chroot_server.stop_server()
 
     def get_backing_transport(self, backing_transport_server):
         """Get a backing transport from a server we are decorating."""