At file:///home/vila/src/bzr/cleanup/test-servers/
------------------------------------------------------------
revno: 5033
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: test-servers
timestamp: Tue 2010-02-09 18:33:44 +0100
message:
Fix imports for ftp_server/pyftpdlib_based.py
=== modified file 'bzrlib/tests/ftp_server/pyftpdlib_based.py'
--- a/bzrlib/tests/ftp_server/pyftpdlib_based.py 2010-01-13 15:30:22
+0000
+++ b/bzrlib/tests/ftp_server/pyftpdlib_based.py 2010-02-09 17:33:44
+0000
@@ -29,8 +29,8 @@
from bzrlib import (
osutils,
trace,
- transport,
)
+from bzrlib.tests import test_server
class AnonymousWithWriteAccessAuthorizer(ftpserver.DummyAuthorizer):
@@ -133,7 +133,7 @@
self.addr = self.socket.getsockname()
-class FTPTestServer(transport.Server):
+class FTPTestServer(test_server.TestServer):
"""Common code for FTP server facilities."""
def __init__(self):
@@ -158,8 +158,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)
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
