/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 bzrlib/tests/blackbox/test_rmbranch.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_rmbranch.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
"""Black-box tests for brz rmbranch."""
 
18
"""Black-box tests for bzr rmbranch."""
19
19
 
20
 
from breezy import (
21
 
    controldir,
 
20
from bzrlib import (
 
21
    bzrdir,
22
22
    )
23
 
from breezy.tests import (
 
23
from bzrlib.tests import (
24
24
    TestCaseWithTransport,
25
25
    )
26
 
from breezy.tests.matchers import ContainsNoVfsCalls
27
26
 
28
27
 
29
28
class TestRemoveBranch(TestCaseWithTransport):
30
29
 
31
 
    def example_tree(self, path='.', format=None):
32
 
        tree = self.make_branch_and_tree(path, format=format)
33
 
        self.build_tree_contents([(path + '/hello', b'foo')])
 
30
    def example_branch(self, path='.'):
 
31
        tree = self.make_branch_and_tree(path)
 
32
        self.build_tree_contents([(path + '/hello', 'foo')])
34
33
        tree.add('hello')
35
34
        tree.commit(message='setup')
36
 
        self.build_tree_contents([(path + '/goodbye', b'baz')])
 
35
        self.build_tree_contents([(path + '/goodbye', 'baz')])
37
36
        tree.add('goodbye')
38
37
        tree.commit(message='setup')
39
 
        return tree
40
38
 
41
39
    def test_remove_local(self):
42
40
        # Remove a local branch.
43
 
        tree = self.example_tree('a')
44
 
        self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
45
 
                           'rmbranch a')
46
 
        self.run_bzr('rmbranch --force a')
47
 
        dir = controldir.ControlDir.open('a')
 
41
        self.example_branch('a')
 
42
        self.run_bzr('rmbranch a')
 
43
        dir = bzrdir.BzrDir.open('a')
48
44
        self.assertFalse(dir.has_branch())
49
 
        self.assertPathExists('a/hello')
50
 
        self.assertPathExists('a/goodbye')
 
45
        self.failUnlessExists('a/hello')
 
46
        self.failUnlessExists('a/goodbye')
51
47
 
52
48
    def test_no_branch(self):
53
 
        # No branch in the current directory.
 
49
        # No branch in the current directory. 
54
50
        self.make_repository('a')
55
 
        self.run_bzr_error(['Not a branch'], 'rmbranch a')
56
 
 
57
 
    def test_no_tree(self):
58
 
        # removing the active branch is possible if there is no tree
59
 
        tree = self.example_tree('a')
60
 
        tree.controldir.destroy_workingtree()
61
 
        self.run_bzr('rmbranch', working_dir='a')
62
 
        dir = controldir.ControlDir.open('a')
63
 
        self.assertFalse(dir.has_branch())
 
51
        self.run_bzr_error(['Not a branch'],
 
52
            'rmbranch a')
64
53
 
65
54
    def test_no_arg(self):
66
55
        # location argument defaults to current directory
67
 
        self.example_tree('a')
68
 
        self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
69
 
                           'rmbranch a')
70
 
        self.run_bzr('rmbranch --force', working_dir='a')
71
 
        dir = controldir.ControlDir.open('a')
 
56
        self.example_branch('a')
 
57
        self.run_bzr('rmbranch', working_dir='a')
 
58
        dir = bzrdir.BzrDir.open('a')
72
59
        self.assertFalse(dir.has_branch())
73
 
 
74
 
    def test_remove_colo(self):
75
 
        # Remove a colocated branch.
76
 
        tree = self.example_tree('a')
77
 
        tree.controldir.create_branch(name="otherbranch")
78
 
        self.assertTrue(tree.controldir.has_branch('otherbranch'))
79
 
        self.run_bzr('rmbranch %s,branch=otherbranch' %
80
 
                     tree.controldir.user_url)
81
 
        dir = controldir.ControlDir.open('a')
82
 
        self.assertFalse(dir.has_branch('otherbranch'))
83
 
        self.assertTrue(dir.has_branch())
84
 
 
85
 
    def test_remove_colo_directory(self):
86
 
        # Remove a colocated branch.
87
 
        tree = self.example_tree('a')
88
 
        tree.controldir.create_branch(name="otherbranch")
89
 
        self.assertTrue(tree.controldir.has_branch('otherbranch'))
90
 
        self.run_bzr('rmbranch otherbranch -d %s' % tree.controldir.user_url)
91
 
        dir = controldir.ControlDir.open('a')
92
 
        self.assertFalse(dir.has_branch('otherbranch'))
93
 
        self.assertTrue(dir.has_branch())
94
 
 
95
 
    def test_remove_active_colo_branch(self):
96
 
        # Remove a colocated branch.
97
 
        dir = self.make_repository('a').controldir
98
 
        branch = dir.create_branch('otherbranch')
99
 
        branch.create_checkout('a')
100
 
        self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
101
 
                           'rmbranch otherbranch -d %s' % branch.controldir.user_url)
102
 
        self.assertTrue(dir.has_branch('otherbranch'))
103
 
        self.run_bzr('rmbranch --force otherbranch -d %s' %
104
 
                     branch.controldir.user_url)
105
 
        self.assertFalse(dir.has_branch('otherbranch'))
106
 
 
107
 
 
108
 
class TestSmartServerRemoveBranch(TestCaseWithTransport):
109
 
 
110
 
    def test_simple_remove_branch(self):
111
 
        self.setup_smart_server_with_call_log()
112
 
        self.make_branch('branch')
113
 
        self.reset_smart_call_log()
114
 
        out, err = self.run_bzr(['rmbranch', self.get_url('branch')])
115
 
        # This figure represent the amount of work to perform this use case. It
116
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
117
 
        # being too low. If rpc_count increases, more network roundtrips have
118
 
        # become necessary for this use case. Please do not adjust this number
119
 
        # upwards without agreement from bzr's network support maintainers.
120
 
        self.assertLength(5, self.hpss_calls)
121
 
        self.assertLength(1, self.hpss_connections)
122
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)