Rev 5053: -s bb.test_selftest passing in file:///home/vila/src/bzr/cleanup/test-servers/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5053
revision-id: v.ladeuil+lp at free.fr-20100209212358-xy1ji7s6srgjh19p
parent: v.ladeuil+lp at free.fr-20100209212154-p0m9xbi5vqsgbdmx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 22:23:58 +0100
message:
  -s bb.test_selftest passing
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-02-09 13:35:40 +0000
+++ b/bzrlib/builtins.py	2010-02-09 21:23:58 +0000
@@ -3444,11 +3444,11 @@
             from bzrlib.tests import stub_sftp
             return stub_sftp.SFTPAbsoluteServer
         if typestring == "memory":
-            from bzrlib.transport.memory import MemoryServer
-            return MemoryServer
+            from bzrlib.tests import test_server
+            return test_server.MemoryServer
         if typestring == "fakenfs":
-            from bzrlib.transport.fakenfs import FakeNFSServer
-            return FakeNFSServer
+            from bzrlib.tests import test_server
+            return test_server.FakeNFSServer
         msg = "No known transport type %s. Supported types are: sftp\n" %\
             (typestring)
         raise errors.BzrCommandError(msg)

=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py	2010-02-03 14:08:55 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py	2010-02-09 21:23:58 +0000
@@ -23,6 +23,7 @@
 from bzrlib.tests import (
     features,
     stub_sftp,
+    test_server,
     )
 
 
@@ -82,9 +83,8 @@
     def test_transport_set_to_memory(self):
         # Test that we can pass a transport to the selftest core - memory
         # version.
-        import bzrlib.transport.memory
         params = self.get_params_passed_to_core('selftest --transport=memory')
-        self.assertEqual(bzrlib.transport.memory.MemoryServer,
+        self.assertEqual(test_server.MemoryServer,
             params[1]["transport"])
 
     def test_parameters_passed_to_core(self):