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

Mon Mar 1 04:11:09 CET 2010

Author: gregory.p.smith
Date: Mon Mar 1 04:11:09 2010
New Revision: 78537
Log:
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/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/test/test_threading.py
Modified: python/branches/release26-maint/Lib/test/test_threading.py
==============================================================================

--- python/branches/release26-maint/Lib/test/test_threading.py	(original)
+++ python/branches/release26-maint/Lib/test/test_threading.py	Mon Mar 1 04:11:09 2010
@@ -227,14 +227,10 @@
 threading._start_new_thread = fail_new_thread
 try:
 t = threading.Thread(target=lambda: None)
- try:
- t.start()
- assert False
- except thread.error:
- self.assertFalse(
- t in threading._limbo,
- "Failed to cleanup _limbo map on failure of Thread.start()."
- )
+ self.assertRaises(thread.error, 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
 
