~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2011 Canonical Ltd
 
1
# Copyright (C) 2011, 2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
"""Black-box tests for bzr branches."""
19
19
 
 
20
from bzrlib.bzrdir import BzrDir
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.assertEqual(out, "* (default)\n")
31
32
 
32
33
    def test_no_branch(self):
33
34
        # Listing the branches in a control directory without branches.
34
35
        self.run_bzr('init-repo a')
35
36
        out, err = self.run_bzr('branches a')
36
 
        self.assertEquals(out, "")
 
37
        self.assertEqual(out, "")
37
38
 
38
39
    def test_default_current_dir(self):
39
40
        # "bzr branches" list the branches in the current directory
40
41
        # if no location was specified.
41
42
        self.run_bzr('init-repo a')
42
43
        out, err = self.run_bzr('branches', working_dir='a')
43
 
        self.assertEquals(out, "")
 
44
        self.assertEqual(out, "")
44
45
 
45
46
    def test_recursive_current(self):
46
47
        self.run_bzr('init .')
47
 
        self.assertEquals(".\n", self.run_bzr('branches --recursive')[0])
 
48
        self.assertEqual(".\n", self.run_bzr('branches --recursive')[0])
48
49
 
49
50
    def test_recursive(self):
50
51
        self.run_bzr('init source')
64
65
        t.bzrdir.create_branch(name='another')
65
66
        t.bzrdir.create_branch(name='colocated')
66
67
        out, err = self.run_bzr('branches a')
67
 
        self.assertEquals(out, "* (default)\n"
 
68
        self.assertEqual(out, "* (default)\n"
68
69
                               "  another\n"
69
70
                               "  colocated\n")
70
71
 
74
75
        branch = t.bzrdir.create_branch(name='colocated')
75
76
        t.bzrdir.set_branch_reference(target_branch=branch)
76
77
        out, err = self.run_bzr('branches a')
77
 
        self.assertEquals(out, "  another\n"
 
78
        self.assertEqual(out, "  another\n"
78
79
                               "* colocated\n")
 
80
 
 
81
    def test_shared_repos(self):
 
82
        self.make_repository('a', shared=True)
 
83
        BzrDir.create_branch_convenience('a/branch1')
 
84
        b = BzrDir.create_branch_convenience('a/branch2')
 
85
        b.create_checkout(lightweight=True, to_location='b')
 
86
        out, err = self.run_bzr('branches b')
 
87
        self.assertEqual(out, "  branch1\n"
 
88
                               "* branch2\n")
 
89
 
 
90
    def test_standalone_branch(self):
 
91
        self.make_branch('a')
 
92
        out, err = self.run_bzr('branches a')
 
93
        self.assertEqual(out, "* (default)\n")