← 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-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
36
36
    pathfilter,
37
37
    readonly,
38
38
    )
39
 
from bzrlib.tests import (
40
 
    features,
41
 
    test_server,
42
 
    )
 
39
from bzrlib.tests import features
43
40
 
44
41
 
45
42
# TODO: Should possibly split transport-specific tests into their own files.
596
593
 
597
594
    def test_fakenfs_server_default(self):
598
595
        # a FakeNFSServer() should bring up a local relpath server for itself
599
 
        server = test_server.FakeNFSServer()
 
596
        server = fakenfs.FakeNFSServer()
600
597
        self.start_server(server)
601
598
        # the url should be decorated appropriately
602
599
        self.assertStartsWith(server.get_url(), 'fakenfs+')
900
897
 
901
898
        bzr+ssh:// should cause bzr to run a remote bzr smart server over SSH.
902
899
        """
903
 
        raise tests.TestSkipped('this test was recently broken,'
904
 
                                ' see bug #626876')
905
900
        # This test actually causes a bzr instance to be invoked, which is very
906
901
        # expensive: it should be the only such test in the test suite.
907
902
        # A reasonable evolution for this would be to simply check inside
957
952
        ssh_server = stub_sftp.SFTPFullAbsoluteServer(StubSSHServer)
958
953
        # We *don't* want to override the default SSH vendor: the detected one
959
954
        # 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
955
        self.start_server(ssh_server)
965
 
        port = ssh_server.port
 
956
        port = ssh_server._listener.port
966
957
 
967
958
        if sys.platform == 'win32':
968
959
            bzr_remote_path = sys.executable + ' ' + self.get_bzr_path()