← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_rmbranch.py
23
23
from bzrlib.tests import (
24
24
    TestCaseWithTransport,
25
25
    )
 
26
from bzrlib.tests.matchers import ContainsNoVfsCalls
26
27
 
27
28
 
28
29
class TestRemoveBranch(TestCaseWithTransport):
29
30
 
30
 
    def example_branch(self, path='.'):
31
 
        tree = self.make_branch_and_tree(path)
 
31
    def example_branch(self, path='.', format=None):
 
32
        tree = self.make_branch_and_tree(path, format=format)
32
33
        self.build_tree_contents([(path + '/hello', 'foo')])
33
34
        tree.add('hello')
34
35
        tree.commit(message='setup')
35
36
        self.build_tree_contents([(path + '/goodbye', 'baz')])
36
37
        tree.add('goodbye')
37
38
        tree.commit(message='setup')
 
39
        return tree
38
40
 
39
41
    def test_remove_local(self):
40
42
        # Remove a local branch.
57
59
        self.run_bzr('rmbranch', working_dir='a')
58
60
        dir = bzrdir.BzrDir.open('a')
59
61
        self.assertFalse(dir.has_branch())
 
62
 
 
63
    def test_remove_colo(self):
 
64
        # Remove a colocated branch.
 
65
        tree = self.example_branch('a', format='development-colo')
 
66
        tree.bzrdir.create_branch(name="otherbranch")
 
67
        self.assertTrue(tree.bzrdir.has_branch('otherbranch'))
 
68
        self.run_bzr('rmbranch %s,branch=otherbranch' % tree.bzrdir.user_url)
 
69
        dir = bzrdir.BzrDir.open('a')
 
70
        self.assertFalse(dir.has_branch('otherbranch'))
 
71
        self.assertTrue(dir.has_branch())
 
72
 
 
73
 
 
74
class TestSmartServerRemoveBranch(TestCaseWithTransport):
 
75
 
 
76
    def test_simple_remove_branch(self):
 
77
        self.setup_smart_server_with_call_log()
 
78
        self.make_branch('branch')
 
79
        self.reset_smart_call_log()
 
80
        out, err = self.run_bzr(['rmbranch', self.get_url('branch')])
 
81
        # This figure represent the amount of work to perform this use case. It
 
82
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
83
        # being too low. If rpc_count increases, more network roundtrips have
 
84
        # become necessary for this use case. Please do not adjust this number
 
85
        # upwards without agreement from bzr's network support maintainers.
 
86
        self.assertLength(2, self.hpss_calls)
 
87
        self.assertLength(1, self.hpss_connections)
 
88
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)