From f75774b5420e18264fcf0cd0a845f4f7377b74b7 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 27 Oct 2009 12:32:18 +0000 Subject: Merged revisions 75633 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75633 | antoine.pitrou | 2009-10-23 20:32:15 +0200 (ven., 23 oct. 2009) | 3 lines Issue #7194: test_thread could try to release an unacquired mutex (and fail). ........ --- Lib/test/test_thread.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index ffd5244..66ad22f 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -26,6 +26,7 @@ class BasicThreadTest(unittest.TestCase): self.done_mutex.acquire() self.running_mutex = thread.allocate_lock() self.random_mutex = thread.allocate_lock() + self.created = 0 self.running = 0 self.next_ident = 0 @@ -37,6 +38,7 @@ class ThreadRunningTests(BasicThreadTest): self.next_ident += 1 verbose_print("creating task %s" % self.next_ident) thread.start_new_thread(self.task, (self.next_ident,)) + self.created += 1 self.running += 1 def task(self, ident): @@ -47,7 +49,7 @@ class ThreadRunningTests(BasicThreadTest): verbose_print("task %s done" % ident) with self.running_mutex: self.running -= 1 - if self.running == 0: + if self.created == NUMTASKS and self.running == 0: self.done_mutex.release() def test_starting_threads(self): @@ -89,6 +91,7 @@ class ThreadRunningTests(BasicThreadTest): for tss in (262144, 0x100000): verbose_print("trying stack_size = (%d)" % tss) self.next_ident = 0 + self.created = 0 for i in range(NUMTASKS): self.newtask() -- cgit v0.12