From c5e62796f9fbcfa4a5c172c7dd870102fd959d6b Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Mon, 1 Mar 2010 03:11:09 +0000 Subject: [PATCH] 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. ........ --- Lib/test/test_threading.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index fe076b134f2..054df7ba69b 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -227,14 +227,10 @@ class ThreadTests(unittest.TestCase): 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