← 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: Patch Queue Manager
  • Date: 2013-06-24 13:05:33 UTC
  • mfrom: (6578.1.1 2.6-merges-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20130624130533-51c8htekjd8mix3u
(jameinel) Merge bzr/2.5 into trunk,
 including the fix for bug #855155 (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branches.py
1
 
# Copyright (C) 2011, 2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2011 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
28
28
        # support.
29
29
        self.run_bzr('init a')
30
30
        out, err = self.run_bzr('branches a')
31
 
        self.assertEqual(out, "* (default)\n")
 
31
        self.assertEquals(out, "* (default)\n")
32
32
 
33
33
    def test_no_branch(self):
34
34
        # Listing the branches in a control directory without branches.
35
35
        self.run_bzr('init-repo a')
36
36
        out, err = self.run_bzr('branches a')
37
 
        self.assertEqual(out, "")
 
37
        self.assertEquals(out, "")
38
38
 
39
39
    def test_default_current_dir(self):
40
40
        # "bzr branches" list the branches in the current directory
41
41
        # if no location was specified.
42
42
        self.run_bzr('init-repo a')
43
43
        out, err = self.run_bzr('branches', working_dir='a')
44
 
        self.assertEqual(out, "")
 
44
        self.assertEquals(out, "")
45
45
 
46
46
    def test_recursive_current(self):
47
47
        self.run_bzr('init .')
48
 
        self.assertEqual(".\n", self.run_bzr('branches --recursive')[0])
 
48
        self.assertEquals(".\n", self.run_bzr('branches --recursive')[0])
49
49
 
50
50
    def test_recursive(self):
51
51
        self.run_bzr('init source')
65
65
        t.bzrdir.create_branch(name='another')
66
66
        t.bzrdir.create_branch(name='colocated')
67
67
        out, err = self.run_bzr('branches a')
68
 
        self.assertEqual(out, "* (default)\n"
 
68
        self.assertEquals(out, "* (default)\n"
69
69
                               "  another\n"
70
70
                               "  colocated\n")
71
71
 
75
75
        branch = t.bzrdir.create_branch(name='colocated')
76
76
        t.bzrdir.set_branch_reference(target_branch=branch)
77
77
        out, err = self.run_bzr('branches a')
78
 
        self.assertEqual(out, "  another\n"
 
78
        self.assertEquals(out, "  another\n"
79
79
                               "* colocated\n")
80
80
 
81
81
    def test_shared_repos(self):
84
84
        b = BzrDir.create_branch_convenience('a/branch2')
85
85
        b.create_checkout(lightweight=True, to_location='b')
86
86
        out, err = self.run_bzr('branches b')
87
 
        self.assertEqual(out, "  branch1\n"
 
87
        self.assertEquals(out, "  branch1\n"
88
88
                               "* branch2\n")
89
89
 
90
90
    def test_standalone_branch(self):
91
91
        self.make_branch('a')
92
92
        out, err = self.run_bzr('branches a')
93
 
        self.assertEqual(out, "* (default)\n")
 
93
        self.assertEquals(out, "* (default)\n")