Rev 4338: Fix the last 6 lock-related failures. in file:///home/vila/src/bzr/experimental/failing-lock-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/failing-lock-tests/

------------------------------------------------------------
revno: 4338
revision-id: v.ladeuil+lp at free.fr-20090511103757-x030vepytcneozqa
parent: v.ladeuil+lp at free.fr-20090511102532-5ios60jawjyhf8ur
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: failing-lock-tests
timestamp: Mon 2009-05-11 12:37:57 +0200
message:
  Fix the last 6 lock-related failures.
  
  * tests/branch_implementations/test_locking.py:
  (TestBranchLocking.test_leave_lock_in_place): Clean locks.
-------------- next part --------------
=== modified file 'bzrlib/tests/branch_implementations/test_locking.py'
--- a/bzrlib/tests/branch_implementations/test_locking.py	2009-04-15 05:39:38 +0000
+++ b/bzrlib/tests/branch_implementations/test_locking.py	2009-05-11 10:37:57 +0000
@@ -432,6 +432,10 @@
             branch.unlock()
         # We should be unable to relock the repo.
         self.assertRaises(errors.LockContention, branch.lock_write)
+        # Cleanup
+        branch.lock_write(token)
+        branch.dont_leave_lock_in_place()
+        branch.unlock()
 
     def test_dont_leave_lock_in_place(self):
         branch = self.make_branch('b')