Rev 5287: (spiv) Fix trivial "was gc'd while locked" warning in in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5287 [merge]
revision-id: pqm at pqm.ubuntu.com-20100611094453-lcedy2ld8qgmjwsq
parent: pqm at pqm.ubuntu.com-20100611075555-qtmp0wp9atss3vkc
parent: andrew.bennetts at canonical.com-20100611075943-hlqvlv0gu7nfsznh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-06-11 10:44:53 +0100
message:
  (spiv) Fix trivial "was gc'd while locked" warning in
  	test_lock_write_raises_in_lock_read. (Andrew Bennetts)
modified:
  bzrlib/tests/per_branch/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
=== modified file 'bzrlib/tests/per_branch/test_locking.py'
--- a/bzrlib/tests/per_branch/test_locking.py	2010-05-20 03:20:04 +0000
+++ b/bzrlib/tests/per_branch/test_locking.py	2010-06-11 07:59:43 +0000
@@ -533,6 +533,7 @@
     def test_lock_write_raises_in_lock_read(self):
         branch = self.make_branch('b')
         branch.lock_read()
+        self.addCleanup(branch.unlock)
         err = self.assertRaises(errors.ReadOnlyError, branch.lock_write)
 
     def test_lock_and_unlock_leaves_repo_unlocked(self):