Merge lp:~jelmer/brz/lock-breaking into lp:brz

[Jelmer Vernooij]

Allow ControlDir.break_lock to not be implemented.

Allow ControlDir.break_lock to not be implemented.

[Martin Packman (gz)]

Thanks.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-dev/1/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-dev/2/

=== modified file 'breezy/tests/per_controldir/test_controldir.py'
--- breezy/tests/per_controldir/test_controldir.py	2018-02-24 15:50:23 +0000
+++ breezy/tests/per_controldir/test_controldir.py	2018-03-03 13:40:36 +0000
@@ -1667,16 +1667,19 @@
                     "format does not support branch references")
         unused_repo = thisdir.create_repository()
         master.lock_write()
-        unused_repo.lock_write()
-        try:
+        with unused_repo.lock_write():
             # two yes's : branch and repository. If the repo in this
             # dir is inappropriately accessed, 3 will be needed, and
             # we'll see that because the stream will be fully consumed
             breezy.ui.ui_factory = CannedInputUIFactory([True, True, True])
             # determine if the repository will have been locked;
             this_repo_locked = \
-                thisdir.open_repository().get_physical_lock_status()
-            master.controldir.break_lock()
+                thisdir.find_repository().get_physical_lock_status()
+            try:
+                master.controldir.break_lock()
+            except NotImplementedError:
+                # bzrdir does not support break_lock
+                raise TestNotApplicable("format does not support breaking locks")
             if this_repo_locked:
                 # only two ys should have been read
                 self.assertEqual([True], breezy.ui.ui_factory.responses)
@@ -1693,8 +1696,6 @@
                 # lock should not have touched it.
                 repo = thisdir.open_repository()
                 self.assertRaises(errors.LockContention, repo.lock_write)
-        finally:
-            unused_repo.unlock()
         self.assertRaises(errors.LockBroken, master.unlock)
 
     def test_break_lock_tree(self):