[Python-checkins] r43309 - in python/trunk/Lib: Queue.py test/test_queue.py

Sat Mar 25 13:15:10 CET 2006

Author: raymond.hettinger
Date: Sat Mar 25 13:15:04 2006
New Revision: 43309
Modified:
 python/trunk/Lib/Queue.py
 python/trunk/Lib/test/test_queue.py
Log:
Don't decrement below zero. And add more tests.
Modified: python/trunk/Lib/Queue.py
==============================================================================

--- python/trunk/Lib/Queue.py	(original)
+++ python/trunk/Lib/Queue.py	Sat Mar 25 13:15:04 2006
@@ -56,11 +56,12 @@
 """
 self.all_tasks_done.acquire()
 try:
- self.unfinished_tasks = unfinished = self.unfinished_tasks - 1
+ unfinished = self.unfinished_tasks - 1
 if unfinished <= 0:
 if unfinished < 0:
 raise ValueError('task_done() called too many times')
 self.all_tasks_done.notifyAll()
+ self.unfinished_tasks = unfinished
 finally:
 self.all_tasks_done.release()
 
Modified: python/trunk/Lib/test/test_queue.py
==============================================================================
--- python/trunk/Lib/test/test_queue.py	(original)
+++ python/trunk/Lib/test/test_queue.py	Sat Mar 25 13:15:04 2006
@@ -228,6 +228,9 @@
 global cum
 while True:
 x = q.get()
+ if x is None:
+ q.task_done()
+ return
 cumlock.acquire()
 try:
 cum += x
@@ -239,18 +242,29 @@
 global cum
 cum = 0
 for i in (0,1):
- t = threading.Thread(target=worker, args=(q,))
- t.setDaemon(True)
- t.start()
+ threading.Thread(target=worker, args=(q,)).start()
 for i in xrange(100):
 q.put(i)
 q.join()
 verify(cum==sum(range(100)), "q.join() did not block until all tasks were done")
+ for i in (0,1):
+ q.put(None) # instruct the threads to close
+ q.join() # verify that you can join twice
+
+def QueueTaskDoneTest(q)
+ try:
+ q.task_done()
+ except ValueError:
+ pass
+ else:
+ raise TestFailed("Did not detect task count going negative")
 
 def test():
 q = Queue.Queue()
+ QueueTaskDoneTest(q)
 QueueJoinTest(q)
 QueueJoinTest(q)
+ QueueTaskDoneTest(q)
 
 q = Queue.Queue(QUEUE_SIZE)
 # Do it a couple of times on the same queue
