← 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: Andrew Bennetts
  • Date: 2010-09-13 06:36:59 UTC
  • mfrom: (5050.17.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5419.
  • Revision ID: andrew.bennetts@canonical.com-20100913063659-gs1d1xnsdbj59sx6
Merge lp:bzr/2.2, including fixes for #619872, #631350, #633745.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
955
955
        ssh_server = stub_sftp.SFTPFullAbsoluteServer(StubSSHServer)
956
956
        # We *don't* want to override the default SSH vendor: the detected one
957
957
        # is the one to use.
 
958
 
 
959
        # FIXME: I don't understand the above comment, SFTPFullAbsoluteServer
 
960
        # inherits from SFTPServer which forces the SSH vendor to
 
961
        # ssh.ParamikoVendor(). So it's forced, not detected. --vila 20100623
958
962
        self.start_server(ssh_server)
959
 
        port = ssh_server._listener.port
 
963
        port = ssh_server.port
960
964
 
961
965
        if sys.platform == 'win32':
962
966
            bzr_remote_path = sys.executable + ' ' + self.get_bzr_path()