← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_selftest.py

  • Committer: Robert Collins
  • Date: 2006-03-28 14:29:13 UTC
  • mto: (1626.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1628.
  • Revision ID: robertc@robertcollins.net-20060328142913-ac5afb37075719c6
Convert log to use the new tsort.merge_sort routine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_selftest.py
16
16
"""UI tests for the test framework."""
17
17
 
18
18
import bzrlib
19
 
from bzrlib.errors import ParamikoNotPresent
20
19
from bzrlib.tests import (
21
20
                          TestCase,
22
21
                          TestCaseInTempDir,
31
30
    def test_transport_set_to_sftp(self):
32
31
        # test the --transport option has taken effect from within the
33
32
        # test_transport test
34
 
        try:
35
 
            import bzrlib.transport.sftp
36
 
        except ParamikoNotPresent:
37
 
            raise TestSkipped("Paramiko not present")
 
33
        import bzrlib.transport.sftp
38
34
        if TestOptions.current_test != "test_transport_set_to_sftp":
39
35
            return
40
36
        self.assertEqual(bzrlib.transport.sftp.SFTPAbsoluteServer,
51
47
 
52
48
    def test_transport(self):
53
49
        # test that --transport=sftp works
54
 
        try:
55
 
            import bzrlib.transport.sftp
56
 
        except ParamikoNotPresent:
57
 
            raise TestSkipped("Paramiko not present")
 
50
        # FIXME RBC 20060123 this should raise TestSkipped if sftp is not
 
51
        # available.
58
52
        old_transport = bzrlib.tests.default_transport
59
53
        old_root = TestCaseInTempDir.TEST_ROOT
60
54
        TestCaseInTempDir.TEST_ROOT = None