← 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-04-21 07:52:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5176.
  • Revision ID: andrew.bennetts@canonical.com-20100421075231-2n8pfxbhlhqxic6w
https://launchpad.net/bugs/532435
Add example merge_file_content hook based on my answer to <https://answers.edge.launchpad.net/bzr/+question/103163>.

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
962
958
        self.start_server(ssh_server)
963
 
        port = ssh_server.port
 
959
        port = ssh_server._listener.port
964
960
 
965
961
        if sys.platform == 'win32':
966
962
            bzr_remote_path = sys.executable + ' ' + self.get_bzr_path()