Rev 5042: selftest -s bt.test_smart_transport passing in file:///home/vila/src/bzr/cleanup/test-servers/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/test-servers/

------------------------------------------------------------
revno: 5042
revision-id: v.ladeuil+lp at free.fr-20100209205903-id0no4eite9m4ejc
parent: v.ladeuil+lp at free.fr-20100209205703-v3jkzqsdto6rnh4k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 21:59:03 +0100
message:
  selftest -s bt.test_smart_transport passing
-------------- next part --------------
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py	2010-02-05 15:20:51 +0000
+++ b/bzrlib/tests/test_smart.py	2010-02-09 20:59:03 +0000
@@ -48,6 +48,7 @@
     server,
     vfs,
     )
+from bzrlib.tests import test_server
 from bzrlib.transport import (
     chroot,
     local,
@@ -106,7 +107,7 @@
         self.transport_server = self.make_transport_server
 
     def make_transport_server(self):
-        return server.SmartTCPServer_for_testing('-' + self.id())
+        return test_server.SmartTCPServer_for_testing('-' + self.id())
 
     def get_smart_medium(self):
         """Get a smart medium to use in tests."""

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2010-02-05 15:26:17 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2010-02-09 20:59:03 +0000
@@ -40,7 +40,10 @@
         server,
         vfs,
 )
-from bzrlib.tests import test_smart
+from bzrlib.tests import (
+    test_server,
+    test_smart,
+    )
 from bzrlib.transport import (
         http,
         local,
@@ -999,7 +1002,7 @@
         # tests wanting a server. The latter should be updated to use
         # self.vfs_transport_factory etc.
         if not backing_transport:
-            mem_server = memory.MemoryServer()
+            mem_server = test_server.MemoryServer()
             mem_server.start_server()
             self.addCleanup(mem_server.stop_server)
             self.permit_url(mem_server.get_url())