Rev 4335: Fix 4 more lock-related test failures. in file:///home/vila/src/bzr/experimental/failing-lock-tests/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4335
revision-id: v.ladeuil+lp at free.fr-20090511071830-jsb2f0v9ozp3fpxb
parent: v.ladeuil+lp at free.fr-20090511071458-bjghkrcdxbv87193
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: failing-lock-tests
timestamp: Mon 2009-05-11 09:18:30 +0200
message:
  Fix 4 more lock-related test failures.
  
  * tests/per_repository/test_repository.py:
  (TestRepositoryLocking.test_leave_lock_in_place): Restore clearing
  lock behavior.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py	2009-04-09 20:23:07 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py	2009-05-11 07:18:30 +0000
@@ -1046,6 +1046,10 @@
             repo.unlock()
         # We should be unable to relock the repo.
         self.assertRaises(errors.LockContention, repo.lock_write)
+        # Cleanup
+        repo.lock_write(token)
+        repo.dont_leave_lock_in_place()
+        repo.unlock()
 
     def test_dont_leave_lock_in_place(self):
         repo = self.make_repository('r')