← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-12-08 09:24:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6351.
  • Revision ID: v.ladeuil+lp@free.fr-20111208092406-ueqyyoftzwk22bq4
Open 2.5b5 for bug fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branches.py
27
27
        # support.
28
28
        self.run_bzr('init a')
29
29
        out, err = self.run_bzr('branches a')
30
 
        self.assertEquals(out, "* (default)\n")
 
30
        self.assertEquals(out, " (default)\n")
31
31
 
32
32
    def test_no_branch(self):
33
33
        # Listing the branches in a control directory without branches.
58
58
        self.assertIs(True, 'source/subsource' in lines, lines)
59
59
        self.assertIs(True, 'checkout/subcheckout' in lines, lines)
60
60
        self.assertIs(True, 'checkout' not in lines, lines)
61
 
 
62
 
    def test_indicates_non_branch(self):
63
 
        t = self.make_branch_and_tree('a', format='development-colo')
64
 
        t.bzrdir.create_branch(name='another')
65
 
        t.bzrdir.create_branch(name='colocated')
66
 
        out, err = self.run_bzr('branches a')
67
 
        self.assertEquals(out, "* (default)\n"
68
 
                               "  another\n"
69
 
                               "  colocated\n")
70
 
 
71
 
    def test_indicates_branch(self):
72
 
        t = self.make_repository('a', format='development-colo')
73
 
        t.bzrdir.create_branch(name='another')
74
 
        branch = t.bzrdir.create_branch(name='colocated')
75
 
        t.bzrdir.set_branch_reference(target_branch=branch)
76
 
        out, err = self.run_bzr('branches a')
77
 
        self.assertEquals(out, "  another\n"
78
 
                               "* colocated\n")