← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
65
65
from bzrlib.transport.http._urllib import HttpTransport_urllib
66
66
from bzrlib.transport.nosmart import NoSmartTransportDecorator
67
67
from bzrlib.transport.readonly import ReadonlyTransportDecorator
68
 
from bzrlib.repofmt import knitrepo, pack_repo
 
68
from bzrlib.repofmt import knitrepo, knitpack_repo
69
69
 
70
70
 
71
71
class TestDefaultFormat(TestCase):
73
73
    def test_get_set_default_format(self):
74
74
        old_format = bzrdir.BzrDirFormat.get_default_format()
75
75
        # default is BzrDirMetaFormat1
76
 
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
 
76
        self.assertIsInstance(old_format, bzrdir.BzrDirMetaFormat1)
77
77
        controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
78
78
        # creating a bzr dir should now create an instrumented dir.
79
79
        try:
80
80
            result = bzrdir.BzrDir.create('memory:///')
81
 
            self.failUnless(isinstance(result, SampleBzrDir))
 
81
            self.assertIsInstance(result, SampleBzrDir)
82
82
        finally:
83
83
            controldir.ControlDirFormat._set_default_format(old_format)
84
84
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
286
286
            format.initialize(url)
287
287
            t = _mod_transport.get_transport(url)
288
288
            found_format = bzrdir.BzrDirFormat.find_format(t)
289
 
            self.failUnless(isinstance(found_format, format.__class__))
 
289
            self.assertIsInstance(found_format, format.__class__)
290
290
        check_format(BzrDirFormatTest1(), "foo")
291
291
        check_format(BzrDirFormatTest2(), "bar")
292
292
 
501
501
    def test_default_stacking_with_stackable_branch_unstackable_repo(self):
502
502
        # Make stackable source branch with an unstackable repo format.
503
503
        source_bzrdir = self.make_bzrdir('source')
504
 
        pack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
 
504
        knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
505
505
        source_branch = bzrlib.branch.BzrBranchFormat7().initialize(
506
506
            source_bzrdir)
507
507
        # Make a directory with a default stacking policy
797
797
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
798
798
        tree2.lock_read()
799
799
        self.addCleanup(tree2.unlock)
800
 
        self.failUnlessExists('tree2/subtree/file')
 
800
        self.assertPathExists('tree2/subtree/file')
801
801
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
802
802
 
803
803
    def test_cloning_metadir(self):
837
837
        # #634470.  -- vila 20100909
838
838
        self.assertRaises(errors.NotBranchError,
839
839
                          tree.bzrdir.sprout, 'repo/tree2')
840
 
#        self.failUnlessExists('repo/tree2/subtree')
841
 
#        self.failIfExists('repo/tree2/subtree/file')
 
840
#        self.assertPathExists('repo/tree2/subtree')
 
841
#        self.assertPathDoesNotExist('repo/tree2/subtree/file')
842
842
 
843
843
    def make_foo_bar_baz(self):
844
844
        foo = bzrdir.BzrDir.create_branch_convenience('foo').bzrdir