Rev 6222: (mbp) Delete _log_memento after TestCase is done with it so as not to upset in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6222 [merge]
revision-id: pqm at pqm.ubuntu.com-20111018080020-kbj94u8bghgfa6c2
parent: pqm at pqm.ubuntu.com-20111017152032-yp2mve2gf9j8ru49
parent: martin.packman at canonical.com-20111017152738-2oom6ee1dprjpl78
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-10-18 08:00:20 +0000
message:
  (mbp) Delete _log_memento after TestCase is done with it so as not to upset
   the funky weakref cleanup mechanism. (Martin Packman)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-10-14 01:48:16 +0000
+++ b/bzrlib/tests/__init__.py	2011-10-17 15:27:38 +0000
@@ -1718,10 +1718,7 @@
         return result
 
     def _startLogFile(self):
-        """Send bzr and test log messages to a temporary file.
-
-        The file is removed as the test is torn down.
-        """
+        """Setup a in-memory target for bzr and testcase log messages"""
         pseudo_log_file = StringIO()
         def _get_log_contents_for_weird_testtools_api():
             return [pseudo_log_file.getvalue().decode(
@@ -1734,14 +1731,13 @@
         self.addCleanup(self._finishLogFile)
 
     def _finishLogFile(self):
-        """Finished with the log file.
-
-        Close the file and delete it.
-        """
+        """Flush and dereference the in-memory log for this testcase"""
         if trace._trace_file:
             # flush the log file, to get all content
             trace._trace_file.flush()
         trace.pop_log_file(self._log_memento)
+        # The logging module now tracks references for cleanup so discard ours
+        del self._log_memento
 
     def thisFailsStrictLockCheck(self):
         """It is known that this test would fail with -Dstrict_locks.