← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-01-23 19:08:05 UTC
  • mfrom: (6437.3.20 2.5)
  • mto: This revision was merged to the branch mainline in revision 6450.
  • Revision ID: jelmer@samba.org-20120123190805-hlcuihkt2dep44cw
merge bzr 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_break_lock.py
24
24
    osutils,
25
25
    tests,
26
26
    )
 
27
from bzrlib.tests.matchers import ContainsNoVfsCalls
27
28
from bzrlib.tests.script import (
28
29
    run_script,
29
30
    )
60
61
        local_branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
61
62
        local_branch.bind(self.master_branch)
62
63
        checkoutdir = bzrdir.BzrDir.create('checkout')
63
 
        branch.BranchReferenceFormat().initialize(
64
 
            checkoutdir, target_branch=local_branch)
 
64
        checkoutdir.set_branch_reference(local_branch)
65
65
        self.wt = checkoutdir.create_workingtree()
66
66
 
67
67
    def test_break_lock_help(self):
138
138
        # being too low. If rpc_count increases, more network roundtrips have
139
139
        # become necessary for this use case. Please do not adjust this number
140
140
        # upwards without agreement from bzr's network support maintainers.
 
141
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
142
        self.assertLength(1, self.hpss_connections)
141
143
        self.assertLength(5, self.hpss_calls)