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

Mon Mar 1 04:19:29 CET 2010

Author: gregory.p.smith
Date: Mon Mar 1 04:19:29 2010
New Revision: 78539
Log:
Merged revisions 78538 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r78538 | gregory.p.smith | 2010年02月28日 19:13:36 -0800 (2010年2月28日) | 9 lines
 
 Merged revisions 78536 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r78536 | gregory.p.smith | 2010年02月28日 19:09:19 -0800 (2010年2月28日) | 2 lines
 
 Cleanup the test added in r78517 based on Ezio Melotti's feedback.
 ........
................
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	Mon Mar 1 04:19:29 2010
@@ -229,14 +229,10 @@
 threading._start_new_thread = fail_new_thread
 try:
 t = threading.Thread(target=lambda: None)
- try:
- t.start()
- assert False
- except threading.ThreadError:
- self.assertFalse(
- t in threading._limbo,
- "Failed to cleanup _limbo map on failure of Thread.start()."
- )
+ self.assertRaises(threading.ThreadError, t.start)
+ self.assertFalse(
+ t in threading._limbo,
+ "Failed to cleanup _limbo map on failure of Thread.start().")
 finally:
 threading._start_new_thread = _start_new_thread
 
