Rev 5582: (jelmer) Only track threads on bzrlib testcases. (Martin [gz]) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5582 [merge]
revision-id: pqm at pqm.ubuntu.com-20101227125132-x1rjkygr6ufpflyn
parent: pqm at pqm.ubuntu.com-20101227023912-prd8bqcc4gzmrzb6
parent: gzlist at googlemail.com-20101226162316-yt09mce69j2esn52
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-12-27 12:51:32 +0000
message:
  (jelmer) Only track threads on bzrlib testcases. (Martin [gz])
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-12-21 10:48:22 +0000
+++ b/bzrlib/tests/__init__.py	2010-12-26 16:23:16 +0000
@@ -286,10 +286,9 @@
         addOnException = getattr(test, "addOnException", None)
         if addOnException is not None:
             addOnException(self._record_traceback_from_test)
-        # Only check for thread leaks if the test case supports cleanups
-        addCleanup = getattr(test, "addCleanup", None)
-        if addCleanup is not None:
-            addCleanup(self._check_leaked_threads, test)
+        # Only check for thread leaks on bzrlib derived test cases
+        if isinstance(test, TestCase):
+            test.addCleanup(self._check_leaked_threads, test)
 
     def startTests(self):
         self.report_tests_starting()

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2010-12-16 13:15:42 +0000
+++ b/bzrlib/tests/test_selftest.py	2010-12-26 16:23:16 +0000
@@ -3251,10 +3251,8 @@
         class Test(unittest.TestCase):
             def runTest(self):
                 pass
-            addCleanup = None # for when on Python 2.7 with native addCleanup
         result = self.LeakRecordingResult()
         test = Test()
-        self.assertIs(getattr(test, "addCleanup", None), None)
         result.startTestRun()
         test.run(result)
         result.stopTestRun()