Rev 3969: Fix "LockableFiles ... was gc'd while unlocked" warning in in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3969
revision-id: pqm at pqm.ubuntu.com-20090129050743-a1sxceuybyrjfv8k
parent: pqm at pqm.ubuntu.com-20090128215712-i4lsbqdybozsp19x
parent: andrew.bennetts at canonical.com-20090129023008-pz4wsc8rp7dsdybi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-01-29 05:07:43 +0000
message:
  Fix "LockableFiles ... was gc'd while unlocked" warning in
  	blackbox.test_shelve. (Andrew Bennetts)
modified:
  bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
    ------------------------------------------------------------
    revno: 3964.2.1
    revision-id: andrew.bennetts at canonical.com-20090129023008-pz4wsc8rp7dsdybi
    parent: pqm at pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: shelve-test-warnings
    timestamp: Thu 2009-01-29 13:30:08 +1100
    message:
      Fix "LockableFiles ... was gc'd while unlocked" warning.
    modified:
      bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
=== modified file 'bzrlib/tests/blackbox/test_shelve.py'
--- a/bzrlib/tests/blackbox/test_shelve.py	2008-12-12 06:09:44 +0000
+++ b/bzrlib/tests/blackbox/test_shelve.py	2009-01-29 02:30:08 +0000
@@ -26,9 +26,14 @@
         err = self.run_bzr('shelve --list')[1]
         self.assertEqual('No shelved changes.\n', err)
 
+    def make_creator(self, tree):
+        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
+        self.addCleanup(creator.finalize)
+        return creator
+
     def test_shelve_one(self):
         tree = self.make_branch_and_tree('.')
-        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
+        creator = self.make_creator(tree)
         shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
         out, err = self.run_bzr('shelve --list', retcode=1)
         self.assertEqual('', err)
@@ -36,7 +41,7 @@
 
     def test_shelve_no_message(self):
         tree = self.make_branch_and_tree('.')
-        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
+        creator = self.make_creator(tree)
         shelf_id = tree.get_shelf_manager().shelve_changes(creator)
         out, err = self.run_bzr('shelve --list', retcode=1)
         self.assertEqual('', err)
@@ -44,9 +49,9 @@
 
     def test_shelf_order(self):
         tree = self.make_branch_and_tree('.')
-        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
+        creator = self.make_creator(tree)
         tree.get_shelf_manager().shelve_changes(creator, 'Foo')
-        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
+        creator = self.make_creator(tree)
         tree.get_shelf_manager().shelve_changes(creator, 'Bar')
         out, err = self.run_bzr('shelve --list', retcode=1)
         self.assertEqual('', err)