← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_break_lock.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
86
86
        master.lock_write()
87
87
        ui.ui_factory = ui.CannedInputUIFactory([True, True])
88
88
        try:
89
 
            self.unused_branch.break_lock()
 
89
            fresh = _mod_branch.Branch.open(self.unused_branch.base)
 
90
            fresh.break_lock()
90
91
        except NotImplementedError:
91
92
            # branch does not support break_lock
92
93
            master.unlock()