[Python-checkins] r76151 - in python/branches/release31-maint: Lib/test/test_threading.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Nov  8 01:36:36 2009
New Revision: 76151

Log:
Merged revisions 76149 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76149 | antoine.pitrou | 2009-11-08 01:30:04 +0100 (dim., 08 nov. 2009) | 11 lines
  
  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 :-))
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_threading.py

Modified: python/branches/release31-maint/Lib/test/test_threading.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_threading.py	(original)
+++ python/branches/release31-maint/Lib/test/test_threading.py	Sun Nov  8 01:36:36 2009
@@ -101,6 +101,8 @@
         _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):