← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-09 14:21:13 UTC
  • mfrom: (5016.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100209142113-o8yqxlo2kqgp98q0
(vila) Merge 2.1 branch including fix for #516183) and fix NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
906
906
        # SFTPFullAbsoluteServer has a get_url method, and doesn't
907
907
        # override the interface (doesn't change self._vendor).
908
908
        # Note that this does encryption, so can be slow.
909
 
        from bzrlib.transport.sftp import SFTPFullAbsoluteServer
910
 
        from bzrlib.tests.stub_sftp import StubServer
 
909
        from bzrlib.tests import stub_sftp
911
910
 
912
911
        # Start an SSH server
913
912
        self.command_executed = []
916
915
        # SSH channel ourselves.  Surely this has already been implemented
917
916
        # elsewhere?
918
917
        started = []
919
 
        class StubSSHServer(StubServer):
 
918
        class StubSSHServer(stub_sftp.StubServer):
920
919
 
921
920
            test = self
922
921
 
950
949
 
951
950
                return True
952
951
 
953
 
        ssh_server = SFTPFullAbsoluteServer(StubSSHServer)
 
952
        ssh_server = stub_sftp.SFTPFullAbsoluteServer(StubSSHServer)
954
953
        # We *don't* want to override the default SSH vendor: the detected one
955
954
        # is the one to use.
956
955
        self.start_server(ssh_server)