← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_branch.py
29
29
    remote,
30
30
    repository,
31
31
    revision,
 
32
    symbol_versioning,
32
33
    tests,
33
34
    )
34
35
from bzrlib.tests import (
74
75
 
75
76
        br = self.get_branch()
76
77
        br.fetch(wt.branch)
77
 
        br.set_revision_history(['rev1', 'rev2', 'rev3'])
 
78
        br.generate_revision_history('rev3')
78
79
        rh = br.revision_history()
79
80
        self.assertEqual(['rev1', 'rev2', 'rev3'], rh)
80
81
        for revision_id in rh:
327
328
        # config file in the branch.
328
329
        branch.nick = "Aaron's branch"
329
330
        if not isinstance(branch, remote.RemoteBranch):
330
 
            self.failUnless(branch._transport.has("branch.conf"))
 
331
            self.assertTrue(branch._transport.has("branch.conf"))
331
332
        # Because the nick has been set explicitly, the nick is now always
332
333
        # "Aaron's branch", regardless of directory name.
333
334
        self.assertEqual(branch.nick, "Aaron's branch")
386
387
    def test_format_description(self):
387
388
        tree = self.make_branch_and_tree('tree')
388
389
        text = tree.branch._format.get_format_description()
389
 
        self.failUnless(len(text))
 
390
        self.assertTrue(len(text))
390
391
 
391
392
    def test_get_commit_builder(self):
392
393
        branch = self.make_branch(".")
459
460
        tree = self.make_branch_and_tree('a')
460
461
        tree.commit('a commit', rev_id='rev1')
461
462
        br = tree.branch
462
 
        br.set_revision_history(["rev1"])
 
463
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
464
            br.set_revision_history, ["rev1"])
463
465
        self.assertEquals(br.revision_history(), ["rev1"])
464
 
        br.set_revision_history([])
 
466
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
467
            br.set_revision_history, [])
465
468
        self.assertEquals(br.revision_history(), [])
466
469
 
467
470
    def test_heads_to_fetch(self):
680
683
        t = self.get_transport()
681
684
        readonly_t = transport.get_transport(self.get_readonly_url())
682
685
        made_branch = self.make_branch('.')
683
 
        self.failUnless(isinstance(made_branch, _mod_branch.Branch))
 
686
        self.assertIsInstance(made_branch, _mod_branch.Branch)
684
687
 
685
688
        # find it via bzrdir opening:
686
689
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
687
690
        direct_opened_branch = opened_control.open_branch()
688
691
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
689
692
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
690
 
        self.failUnless(isinstance(direct_opened_branch._format,
691
 
                        self.branch_format.__class__))
 
693
        self.assertIsInstance(direct_opened_branch._format,
 
694
            self.branch_format.__class__)
692
695
 
693
696
        # find it via Branch.open
694
697
        opened_branch = _mod_branch.Branch.open(readonly_t.base)
695
 
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
 
698
        self.assertIsInstance(opened_branch, made_branch.__class__)
696
699
        self.assertEqual(made_branch._format.__class__,
697
700
                         opened_branch._format.__class__)
698
701
        # if it has a unique id string, can we probe for it ?