Rev 4336: 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: 4336
revision-id: v.ladeuil+lp at free.fr-20090511074936-smhc6y3kvl28zu5m
parent: v.ladeuil+lp at free.fr-20090511071830-jsb2f0v9ozp3fpxb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: failing-lock-tests
timestamp: Mon 2009-05-11 09:49:36 +0200
message:
  Fix 4 more lock-related test failures.
  
  * tests/per_repository/test_write_group.py:
  (TestWriteGroup.test_abort_write_group_does_not_raise_when_suppressed):
  Better cleanup.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_repository/test_write_group.py'
--- a/bzrlib/tests/per_repository/test_write_group.py	2009-04-21 07:22:04 +0000
+++ b/bzrlib/tests/per_repository/test_write_group.py	2009-05-11 07:49:36 +0000
@@ -112,13 +112,13 @@
         self.addCleanup(repo.unlock)
         repo.start_write_group()
         # Damage the repository on the filesystem
-        self.get_transport('').rename('repo', 'foo')
+        t = self.get_transport('')
+        t.rename('repo', 'foo')
+        self.addCleanup(t.rename, 'foo', 'repo')
         # abort_write_group will not raise an error, because either an
         # exception was not generated, or the exception was caught and
         # suppressed.  See also test_pack_repository's test of the same name.
         self.assertEqual(None, repo.abort_write_group(suppress_errors=True))
-        if token is not None:
-            repo.leave_lock_in_place()
 
     def test_empty_get_missing_parent_inventories(self):
         """A new write group has no missing parent inventories."""