← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server/medusa_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/medusa_based.py
33
33
from bzrlib import (
34
34
    tests,
35
35
    trace,
36
 
    transport,
37
36
    )
 
37
from bzrlib.tests import test_server
38
38
 
39
39
 
40
40
class test_filesystem(medusa.filesys.os_filesystem):
210
210
        trace.mutter('ftp_server %s: %s', type, message)
211
211
 
212
212
 
213
 
class FTPTestServer(transport.Server):
 
213
class FTPTestServer(test_server.TestServer):
214
214
    """Common code for FTP server facilities."""
215
215
 
216
216
    no_unicode_support = True
236
236
        self.logs.append(message)
237
237
 
238
238
    def start_server(self, vfs_server=None):
239
 
        from bzrlib.transport.local import LocalURLServer
240
 
        if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
 
239
        if not (vfs_server is None or isinstance(vfs_server,
 
240
                                                 test_server.LocalURLServer)):
241
241
            raise AssertionError(
242
242
                "FTPServer currently assumes local transport, got %s" % vfs_server)
243
243
        self._root = os.getcwdu()