/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 breezy/tests/blackbox/test_break_lock.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_break_lock.py
58
58
        self.master_branch = controldir.ControlDir.create_branch_convenience(
59
59
            'master-repo/master-branch')
60
60
        controldir.ControlDir.create('repo').create_repository()
61
 
        local_branch = controldir.ControlDir.create_branch_convenience('repo/branch')
 
61
        local_branch = controldir.ControlDir.create_branch_convenience(
 
62
            'repo/branch')
62
63
        local_branch.bind(self.master_branch)
63
64
        checkoutdir = controldir.ControlDir.create('checkout')
64
65
        checkoutdir.set_branch_reference(local_branch)
80
81
        self.assertRaises(errors.LockBroken, self.master_branch.unlock)
81
82
 
82
83
    def test_break_lock_everything_locked(self):
83
 
        ### if everything is locked, we should be able to unlock the lot.
 
84
        # if everything is locked, we should be able to unlock the lot.
84
85
        # however, we dont test breaking the working tree because we
85
86
        # cannot accurately do so right now: the dirstate lock is held
86
87
        # by an os lock, and we need to spawn a separate process to lock it
132
133
        t = self.make_branch_and_tree('branch')
133
134
        t.branch.lock_write()
134
135
        self.reset_smart_call_log()
135
 
        out, err = self.run_bzr(['break-lock', '--force', self.get_url('branch')])
 
136
        out, err = self.run_bzr(
 
137
            ['break-lock', '--force', self.get_url('branch')])
136
138
        # This figure represent the amount of work to perform this use case. It
137
139
        # is entirely ok to reduce this number if a test fails due to rpc_count
138
140
        # being too low. If rpc_count increases, more network roundtrips have