← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server/pyftpdlib_based.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/ftp_server/pyftpdlib_based.py
29
29
from bzrlib import (
30
30
    osutils,
31
31
    trace,
32
 
    transport,
33
32
    )
 
33
from bzrlib.tests import test_server
34
34
 
35
35
 
36
36
class AnonymousWithWriteAccessAuthorizer(ftpserver.DummyAuthorizer):
133
133
        self.addr = self.socket.getsockname()
134
134
 
135
135
 
136
 
class FTPTestServer(transport.Server):
 
136
class FTPTestServer(test_server.TestServer):
137
137
    """Common code for FTP server facilities."""
138
138
 
139
139
    def __init__(self):
158
158
        self.logs.append(message)
159
159
 
160
160
    def start_server(self, vfs_server=None):
161
 
        from bzrlib.transport.local import LocalURLServer
162
 
        if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
 
161
        if not (vfs_server is None or isinstance(vfs_server,
 
162
                                                 test_server.LocalURLServer)):
163
163
            raise AssertionError(
164
164
                "FTPServer currently assumes local transport, got %s"
165
165
                % vfs_server)