← 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: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branches.py
17
17
 
18
18
"""Black-box tests for bzr branches."""
19
19
 
 
20
from bzrlib.branch import BranchReferenceFormat
20
21
from bzrlib.tests import TestCaseWithTransport
21
22
 
22
23
 
27
28
        # support.
28
29
        self.run_bzr('init a')
29
30
        out, err = self.run_bzr('branches a')
30
 
        self.assertEquals(out, " (default)\n")
 
31
        self.assertEquals(out, "* (default)\n")
31
32
 
32
33
    def test_no_branch(self):
33
34
        # Listing the branches in a control directory without branches.
41
42
        self.run_bzr('init-repo a')
42
43
        out, err = self.run_bzr('branches', working_dir='a')
43
44
        self.assertEquals(out, "")
 
45
 
 
46
    def test_recursive_current(self):
 
47
        self.run_bzr('init .')
 
48
        self.assertEquals(".\n", self.run_bzr('branches --recursive')[0])
 
49
 
 
50
    def test_recursive(self):
 
51
        self.run_bzr('init source')
 
52
        self.run_bzr('init source/subsource')
 
53
        self.run_bzr('checkout --lightweight source checkout')
 
54
        self.run_bzr('init checkout/subcheckout')
 
55
        self.run_bzr('init checkout/.bzr/subcheckout')
 
56
        out = self.run_bzr('branches --recursive')[0]
 
57
        lines = out.split('\n')
 
58
        self.assertIs(True, 'source' in lines, lines)
 
59
        self.assertIs(True, 'source/subsource' in lines, lines)
 
60
        self.assertIs(True, 'checkout/subcheckout' in lines, lines)
 
61
        self.assertIs(True, 'checkout' not in lines, lines)
 
62
 
 
63
    def test_indicates_non_branch(self):
 
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')
 
67
        out, err = self.run_bzr('branches a')
 
68
        self.assertEquals(out, "* (default)\n"
 
69
                               "  another\n"
 
70
                               "  colocated\n")
 
71
 
 
72
    def test_indicates_branch(self):
 
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
        BranchReferenceFormat().initialize(t.bzrdir, target_branch=branch)
 
77
        out, err = self.run_bzr('branches a')
 
78
        self.assertEquals(out, "  another\n"
 
79
                               "* colocated\n")