/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_branches.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_branches.py
62
62
 
63
63
    def test_indicates_non_branch(self):
64
64
        t = self.make_branch_and_tree('a', format='development-colo')
65
 
        t.bzrdir.create_branch(name='another')
66
 
        t.bzrdir.create_branch(name='colocated')
 
65
        t.controldir.create_branch(name='another')
 
66
        t.controldir.create_branch(name='colocated')
67
67
        out, err = self.run_bzr('branches a')
68
68
        self.assertEqual(out, "* (default)\n"
69
69
                               "  another\n"
71
71
 
72
72
    def test_indicates_branch(self):
73
73
        t = self.make_repository('a', format='development-colo')
74
 
        t.bzrdir.create_branch(name='another')
75
 
        branch = t.bzrdir.create_branch(name='colocated')
76
 
        t.bzrdir.set_branch_reference(target_branch=branch)
 
74
        t.controldir.create_branch(name='another')
 
75
        branch = t.controldir.create_branch(name='colocated')
 
76
        t.controldir.set_branch_reference(target_branch=branch)
77
77
        out, err = self.run_bzr('branches a')
78
78
        self.assertEqual(out, "  another\n"
79
79
                               "* colocated\n")