← 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: Jelmer Vernooij
  • Date: 2010-08-20 19:07:17 UTC
  • mfrom: (5385 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5389.
  • Revision ID: jelmer@samba.org-20100820190717-txm7aiyh6wtumgd3
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
900
900
 
901
901
        bzr+ssh:// should cause bzr to run a remote bzr smart server over SSH.
902
902
        """
903
 
        raise tests.TestSkipped('this test was recently broken,'
904
 
                                ' see bug #626876')
905
903
        # This test actually causes a bzr instance to be invoked, which is very
906
904
        # expensive: it should be the only such test in the test suite.
907
905
        # A reasonable evolution for this would be to simply check inside
957
955
        ssh_server = stub_sftp.SFTPFullAbsoluteServer(StubSSHServer)
958
956
        # We *don't* want to override the default SSH vendor: the detected one
959
957
        # is the one to use.
960
 
 
961
 
        # FIXME: I don't understand the above comment, SFTPFullAbsoluteServer
962
 
        # inherits from SFTPServer which forces the SSH vendor to
963
 
        # ssh.ParamikoVendor(). So it's forced, not detected. --vila 20100623
964
958
        self.start_server(ssh_server)
965
 
        port = ssh_server.port
 
959
        port = ssh_server._listener.port
966
960
 
967
961
        if sys.platform == 'win32':
968
962
            bzr_remote_path = sys.executable + ' ' + self.get_bzr_path()