Rev 5034: Fix imports for ftp_server/medusa_based.py in file:///home/vila/src/bzr/cleanup/test-servers/

Vincent Ladeuil v.ladeuil+lp at free.fr
Tue Feb 9 17:35:07 GMT 2010


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

------------------------------------------------------------
revno: 5034
revision-id: v.ladeuil+lp at free.fr-20100209173507-0q2pr34po00ln65u
parent: v.ladeuil+lp at free.fr-20100209173344-w505pzqf9c9cvr52
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-servers
timestamp: Tue 2010-02-09 18:35:07 +0100
message:
  Fix imports for ftp_server/medusa_based.py
-------------- next part --------------
=== modified file 'bzrlib/tests/ftp_server/medusa_based.py'
--- a/bzrlib/tests/ftp_server/medusa_based.py	2010-01-08 03:35:09 +0000
+++ b/bzrlib/tests/ftp_server/medusa_based.py	2010-02-09 17:35:07 +0000
@@ -33,8 +33,8 @@
 from bzrlib import (
     tests,
     trace,
-    transport,
     )
+from bzrlib.tests import test_server
 
 
 class test_filesystem(medusa.filesys.os_filesystem):
@@ -210,7 +210,7 @@
         trace.mutter('ftp_server %s: %s', type, message)
 
 
-class FTPTestServer(transport.Server):
+class FTPTestServer(test_server.TestServer):
     """Common code for FTP server facilities."""
 
     no_unicode_support = True
@@ -236,8 +236,8 @@
         self.logs.append(message)
 
     def start_server(self, vfs_server=None):
-        from bzrlib.transport.local import LocalURLServer
-        if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
+        if not (vfs_server is None or isinstance(vfs_server,
+                                                 test_server.LocalURLServer)):
             raise AssertionError(
                 "FTPServer currently assumes local transport, got %s" % vfs_server)
         self._root = os.getcwdu()



More information about the bazaar-commits mailing list