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 (Sun, 28 Feb 2010) | 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 (Sun, 28 Feb 2010) | 2 lines
Cleanup the test added in r78517 based on Ezio Melotti's feedback.
........
................
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 639e42b..71135cc 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -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