← 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: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_break_lock.py
18
18
 
19
19
from bzrlib import (
20
20
    branch,
 
21
    bzrdir,
21
22
    config,
22
 
    controldir,
23
23
    errors,
24
24
    osutils,
25
25
    tests,
26
26
    )
27
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
28
27
from bzrlib.tests.script import (
29
28
    run_script,
30
29
    )
54
53
             'repo/',
55
54
             'repo/branch/',
56
55
             'checkout/'])
57
 
        controldir.ControlDir.create('master-repo').create_repository()
58
 
        self.master_branch = controldir.ControlDir.create_branch_convenience(
 
56
        bzrdir.BzrDir.create('master-repo').create_repository()
 
57
        self.master_branch = bzrdir.BzrDir.create_branch_convenience(
59
58
            'master-repo/master-branch')
60
 
        controldir.ControlDir.create('repo').create_repository()
61
 
        local_branch = controldir.ControlDir.create_branch_convenience('repo/branch')
 
59
        bzrdir.BzrDir.create('repo').create_repository()
 
60
        local_branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
62
61
        local_branch.bind(self.master_branch)
63
 
        checkoutdir = controldir.ControlDir.create('checkout')
64
 
        checkoutdir.set_branch_reference(local_branch)
 
62
        checkoutdir = bzrdir.BzrDir.create('checkout')
 
63
        branch.BranchReferenceFormat().initialize(
 
64
            checkoutdir, target_branch=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)
143
 
        self.assertLength(5, self.hpss_calls)
 
141
        self.assertLength(19, self.hpss_calls)