← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
34
34
                          TestSuite,
35
35
                          TextTestRunner,
36
36
                          )
 
37
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
37
38
from bzrlib.tests.TestUtil import _load_module_by_name
38
39
import bzrlib.errors as errors
39
40
from bzrlib import symbol_versioning
40
41
from bzrlib.symbol_versioning import zero_ten, zero_eleven
41
42
from bzrlib.trace import note
 
43
from bzrlib.transport.memory import MemoryServer, MemoryTransport
42
44
from bzrlib.version import _get_bzr_source_tree
43
45
 
44
46
 
60
62
        """Test logs are captured when a test fails."""
61
63
        self.log('a test message')
62
64
        self._log_file.flush()
63
 
        self.assertContainsRe(self._get_log(), 'a test message\n')
 
65
        self.assertContainsRe(self._get_log(keep_log_file=True),
 
66
                              'a test message\n')
64
67
 
65
68
 
66
69
class TestTreeShape(TestCaseInTempDir):
474
477
        self.assertRaises(AssertionError, self.assertIsDirectory, 'not_here', t)
475
478
 
476
479
 
 
480
class TestTestCaseTransports(TestCaseWithTransport):
 
481
 
 
482
    def setUp(self):
 
483
        super(TestTestCaseTransports, self).setUp()
 
484
        self.transport_server = MemoryServer
 
485
 
 
486
    def test_make_bzrdir_preserves_transport(self):
 
487
        t = self.get_transport()
 
488
        result_bzrdir = self.make_bzrdir('subdir')
 
489
        self.assertIsInstance(result_bzrdir.transport, 
 
490
                              MemoryTransport)
 
491
        # should not be on disk, should only be in memory
 
492
        self.failIfExists('subdir')
 
493
 
 
494
 
477
495
class TestChrootedTest(ChrootedTestCase):
478
496
 
479
497
    def test_root_is_root(self):
903
921
        self.assertIsInstance(bzrlib.bzrdir.BzrDir.open('b')._format,
904
922
                              bzrlib.bzrdir.BzrDirFormat6)
905
923
 
 
924
    def test_make_branch_and_mutable_tree(self):
 
925
        # we should be able to get a new branch and a mutable tree from
 
926
        # TestCaseWithTransport
 
927
        tree = self.make_branch_and_memory_tree('a')
 
928
        self.assertIsInstance(tree, bzrlib.memorytree.MemoryTree)
 
929
 
 
930
 
 
931
class TestSFTPMakeBranchAndTree(TestCaseWithSFTPServer):
 
932
 
 
933
    def test_make_tree_for_sftp_branch(self):
 
934
        """Transports backed by local directories create local trees."""
 
935
 
 
936
        tree = self.make_branch_and_tree('t1')
 
937
        base = tree.bzrdir.root_transport.base
 
938
        self.failIf(base.startswith('sftp'),
 
939
                'base %r is on sftp but should be local' % base)
 
940
        self.assertEquals(tree.bzrdir.root_transport,
 
941
                tree.branch.bzrdir.root_transport)
 
942
        self.assertEquals(tree.bzrdir.root_transport,
 
943
                tree.branch.repository.bzrdir.root_transport)
 
944
 
906
945
 
907
946
class TestSelftest(TestCase):
908
947
    """Tests of bzrlib.tests.selftest."""