Merge lp:~gz/bzr/only_track_threads_on_bzrlib_testcases_637674 into lp:bzr

[Martin Packman]

Only track threads on bzrlib testcases.

When updating the thread leak detection code I was trying to be clever and get it working on non-bzrlib testcases. In practice, this is more likely to break things on Python 2.7 than help, so this branch limits it to case instances derived from our code.

Branch fixes the same two Python 2.7 failures as lp:~jelmer/bzr/super-startTests so should mean that branch doesn't need to be merged.

[Jelmer Vernooij (jelmer)]

That's quite a bit neater than my version. Thanks :-)

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-12-21 10:48:22 +0000
+++ bzrlib/tests/__init__.py	2010-12-26 16:29:28 +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'
--- bzrlib/tests/test_selftest.py	2010-12-16 13:15:42 +0000
+++ bzrlib/tests/test_selftest.py	2010-12-26 16:29:28 +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()