~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2013-08-09 15:09:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6587.
  • Revision ID: v.ladeuil+lp@free.fr-20130809150923-y71dusyorep0hbkt
Fix various typos in docstrings. Rename 'buffer' to 'buf' since it's now a python builtin function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2010 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
"""Black-box tests for bzr rmbranch."""
 
19
 
 
20
from bzrlib import (
 
21
    controldir,
 
22
    )
 
23
from bzrlib.tests import (
 
24
    TestCaseWithTransport,
 
25
    )
 
26
from bzrlib.tests.matchers import ContainsNoVfsCalls
 
27
 
 
28
 
 
29
class TestRemoveBranch(TestCaseWithTransport):
 
30
 
 
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', 'foo')])
 
34
        tree.add('hello')
 
35
        tree.commit(message='setup')
 
36
        self.build_tree_contents([(path + '/goodbye', 'baz')])
 
37
        tree.add('goodbye')
 
38
        tree.commit(message='setup')
 
39
        return tree
 
40
 
 
41
    def test_remove_local(self):
 
42
        # 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')
 
48
        self.assertFalse(dir.has_branch())
 
49
        self.assertPathExists('a/hello')
 
50
        self.assertPathExists('a/goodbye')
 
51
 
 
52
    def test_no_branch(self):
 
53
        # No branch in the current directory.
 
54
        self.make_repository('a')
 
55
        self.run_bzr_error(['Not a branch'],
 
56
            'rmbranch a')
 
57
 
 
58
    def test_no_tree(self):
 
59
        # removing the active branch is possible if there is no tree
 
60
        tree = self.example_tree('a')
 
61
        tree.bzrdir.destroy_workingtree()
 
62
        self.run_bzr('rmbranch', working_dir='a')
 
63
        dir = controldir.ControlDir.open('a')
 
64
        self.assertFalse(dir.has_branch())
 
65
 
 
66
    def test_no_arg(self):
 
67
        # location argument defaults to current directory
 
68
        self.example_tree('a')
 
69
        self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
 
70
            'rmbranch a')
 
71
        self.run_bzr('rmbranch --force', working_dir='a')
 
72
        dir = controldir.ControlDir.open('a')
 
73
        self.assertFalse(dir.has_branch())
 
74
 
 
75
    def test_remove_colo(self):
 
76
        # Remove a colocated branch.
 
77
        tree = self.example_tree('a')
 
78
        tree.bzrdir.create_branch(name="otherbranch")
 
79
        self.assertTrue(tree.bzrdir.has_branch('otherbranch'))
 
80
        self.run_bzr('rmbranch %s,branch=otherbranch' % tree.bzrdir.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.bzrdir.create_branch(name="otherbranch")
 
89
        self.assertTrue(tree.bzrdir.has_branch('otherbranch'))
 
90
        self.run_bzr('rmbranch otherbranch -d %s' % tree.bzrdir.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').bzrdir
 
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.bzrdir.user_url)
 
102
        self.assertTrue(dir.has_branch('otherbranch'))
 
103
        self.run_bzr('rmbranch --force otherbranch -d %s' % branch.bzrdir.user_url)
 
104
        self.assertFalse(dir.has_branch('otherbranch'))
 
105
 
 
106
 
 
107
class TestSmartServerRemoveBranch(TestCaseWithTransport):
 
108
 
 
109
    def test_simple_remove_branch(self):
 
110
        self.setup_smart_server_with_call_log()
 
111
        self.make_branch('branch')
 
112
        self.reset_smart_call_log()
 
113
        out, err = self.run_bzr(['rmbranch', self.get_url('branch')])
 
114
        # This figure represent the amount of work to perform this use case. It
 
115
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
116
        # being too low. If rpc_count increases, more network roundtrips have
 
117
        # become necessary for this use case. Please do not adjust this number
 
118
        # upwards without agreement from bzr's network support maintainers.
 
119
        self.assertLength(5, self.hpss_calls)
 
120
        self.assertLength(1, self.hpss_connections)
 
121
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)