Rev 4332: 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: 4332
revision-id: v.ladeuil+lp at free.fr-20090508161726-gwbl943242sh3lxb
parent: v.ladeuil+lp at free.fr-20090508155800-svg2sw0dp40udwq5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: failing-lock-tests
timestamp: Fri 2009-05-08 18:17:26 +0200
message:
  Fix 4 more lock-related test failures.
  
  * tests/test_knit.py:
  (TestPackKnitAccess.make_vf_for_retrying): The tree should be
  unlocked, not only the repository.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py	2009-04-22 07:00:51 +0000
+++ b/bzrlib/tests/test_knit.py	2009-05-08 16:17:26 +0000
@@ -368,7 +368,7 @@
         """
         tree = self.make_branch_and_memory_tree('tree')
         tree.lock_write()
-        self.addCleanup(tree.branch.repository.unlock)
+        self.addCleanup(tree.unlock)
         tree.add([''], ['root-id'])
         tree.commit('one', rev_id='rev-1')
         tree.commit('two', rev_id='rev-2')
@@ -385,7 +385,6 @@
         collection.reset()
         repo.refresh_data()
         vf = tree.branch.repository.revisions
-        del tree
         # Set up a reload() function that switches to using the new pack file
         new_index = new_pack.revision_index
         access_tuple = new_pack.access_tuple()