[Python-checkins] r60634 - python/trunk/Lib/test/test_queue.py
georg.brandl
python-checkins at python.org
Thu Feb 7 00:45:51 CET 2008
Author: georg.brandl
Date: Thu Feb 7 00:45:51 2008
New Revision: 60634
Modified:
python/trunk/Lib/test/test_queue.py
Log:
Revert accidental changes to test_queue in r60605.
Modified: python/trunk/Lib/test/test_queue.py
==============================================================================
--- python/trunk/Lib/test/test_queue.py (original)
+++ python/trunk/Lib/test/test_queue.py Thu Feb 7 00:45:51 2008
@@ -9,10 +9,6 @@
QUEUE_SIZE = 5
-def qfull(q):
- return q.maxsize > 0 and q.qsize() == q.maxsize
-
-
# A thread to run a function that unclogs a blocked Queue.
class _TriggerThread(threading.Thread):
def __init__(self, fn, args):
@@ -90,7 +86,7 @@
self.cumlock = threading.Lock()
def simple_queue_test(self, q):
- if q.qsize():
+ if not q.empty():
raise RuntimeError, "Call this function with an empty queue"
# I guess we better check things actually queue correctly a little :)
q.put(111)
@@ -104,10 +100,10 @@
"Didn't seem to queue the correct data!")
for i in range(QUEUE_SIZE-1):
q.put(i)
- self.assert_(q.qsize(), "Queue should not be empty")
- self.assert_(not qfull(q), "Queue should not be full")
+ self.assert_(not q.empty(), "Queue should not be empty")
+ self.assert_(not q.full(), "Queue should not be full")
q.put("last")
- self.assert_(qfull(q), "Queue should be full")
+ self.assert_(q.full(), "Queue should be full")
try:
q.put("full", block=0)
self.fail("Didn't appear to block with a full queue")
@@ -124,7 +120,7 @@
# Empty it
for i in range(QUEUE_SIZE):
q.get()
- self.assert_(not q.qsize(), "Queue should be empty")
+ self.assert_(q.empty(), "Queue should be empty")
try:
q.get(block=0)
self.fail("Didn't appear to block with an empty queue")
@@ -228,7 +224,7 @@
class FailingQueueTest(unittest.TestCase, BlockingTestMixin):
def failing_queue_test(self, q):
- if q.qsize():
+ if not q.empty():
raise RuntimeError, "Call this function with an empty queue"
for i in range(QUEUE_SIZE-1):
q.put(i)
@@ -246,7 +242,7 @@
except FailingQueueException:
pass
q.put("last")
- self.assert_(qfull(q), "Queue should be full")
+ self.assert_(q.full(), "Queue should be full")
# Test a failing blocking put
q.fail_next_put = True
try:
@@ -268,17 +264,17 @@
# Check the Queue isn't damaged.
# put failed, but get succeeded - re-add
q.put("last")
- self.assert_(qfull(q), "Queue should be full")
+ self.assert_(q.full(), "Queue should be full")
q.get()
- self.assert_(not qfull(q), "Queue should not be full")
+ self.assert_(not q.full(), "Queue should not be full")
q.put("last")
- self.assert_(qfull(q), "Queue should be full")
+ self.assert_(q.full(), "Queue should be full")
# Test a blocking put
self.do_blocking_test(q.put, ("full",), q.get, ())
# Empty it
for i in range(QUEUE_SIZE):
q.get()
- self.assert_(not q.qsize(), "Queue should be empty")
+ self.assert_(q.empty(), "Queue should be empty")
q.put("first")
q.fail_next_get = True
try:
@@ -286,16 +282,16 @@
self.fail("The queue didn't fail when it should have")
except FailingQueueException:
pass
- self.assert_(q.qsize(), "Queue should not be empty")
+ self.assert_(not q.empty(), "Queue should not be empty")
q.fail_next_get = True
try:
q.get(timeout=0.1)
self.fail("The queue didn't fail when it should have")
except FailingQueueException:
pass
- self.assert_(q.qsize(), "Queue should not be empty")
+ self.assert_(not q.empty(), "Queue should not be empty")
q.get()
- self.assert_(not q.qsize(), "Queue should be empty")
+ self.assert_(q.empty(), "Queue should be empty")
q.fail_next_get = True
try:
self.do_exceptional_blocking_test(q.get, (), q.put, ('empty',),
@@ -304,9 +300,9 @@
except FailingQueueException:
pass
# put succeeded, but get failed.
- self.assert_(q.qsize(), "Queue should not be empty")
+ self.assert_(not q.empty(), "Queue should not be empty")
q.get()
- self.assert_(not q.qsize(), "Queue should be empty")
+ self.assert_(q.empty(), "Queue should be empty")
def test_failing_queue(self):
# Test to make sure a queue is functioning correctly.
More information about the Python-checkins
mailing list