From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 8 Nov 2009 00:36:33 +0000 (+0000)
Subject: Merged revisions 76148 via svnmerge from
X-Git-Tag: v2.6.5rc1~375
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e31998363711a8dcc92f9dc541a2981c95a22f69;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 76148 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76148 | antoine.pitrou | 2009-11-08 01:24:12 +0100 (dim., 08 nov. 2009) | 4 lines

  Kill a small potential leak in test_threading.
  The leak may not manifest itself if the OS re-uses the same thread ids
  (I suppose Neal's machine doesn't :-))
........
---

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index e9ff4cac88f7..04e37a786bcc 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -100,6 +100,8 @@ class ThreadTests(unittest.TestCase):
         thread.start_new_thread(f, ())
         done.wait()
         self.assertFalse(ident[0] is None)
+        # Kill the "immortal" _DummyThread
+        del threading._active[ident[0]]
 
     # run with a small(ish) thread stack size (256kB)
     def test_various_ops_small_stack(self):