2008-05-11 19:59:59 +00:00
|
|
|
# Some simple queue module tests, plus some failure conditions
|
2004-08-20 02:37:25 +00:00
|
|
|
# to ensure the Queue locks remain stable.
|
2008-05-11 19:59:59 +00:00
|
|
|
import queue
|
2002-04-19 00:11:32 +00:00
|
|
|
import time
|
2008-02-05 18:48:51 +00:00
|
|
|
import unittest
|
2008-05-20 21:35:26 +00:00
|
|
|
from test import support
|
Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80552 | victor.stinner | 2010-04-27 23:46:03 +0200 (mar., 27 avril 2010) | 3 lines
Issue #7449, part 1: fix test_support.py for Python compiled without thread
........
r80553 | victor.stinner | 2010-04-27 23:47:01 +0200 (mar., 27 avril 2010) | 1 line
Issue #7449, part 2: regrtest.py -j option requires thread support
........
r80554 | victor.stinner | 2010-04-27 23:51:26 +0200 (mar., 27 avril 2010) | 9 lines
Issue #7449 part 3, test_doctest: import trace module in test_coverage()
Import trace module fail if the threading module is missing. test_coverage() is
only used if test_doctest.py is used with the -c option. This commit allows to
execute the test suite without thread support.
Move "import trace" in test_coverage() and use
test_support.import_module('trace').
........
r80555 | victor.stinner | 2010-04-27 23:56:26 +0200 (mar., 27 avril 2010) | 6 lines
Issue #7449, part 4: skip test_multiprocessing if thread support is disabled
import threading after _multiprocessing to raise a more revelant error message:
"No module named _multiprocessing". _multiprocessing is not compiled without
thread support.
........
r80556 | victor.stinner | 2010-04-28 00:01:24 +0200 (mer., 28 avril 2010) | 8 lines
Issue #7449, part 5: split Test.test_open() of ctypes/test/test_errno.py
* Split Test.test_open() in 2 functions: test_open() and test_thread_open()
* Skip test_open() and test_thread_open() if we are unable to find the C
library
* Skip test_thread_open() if thread support is disabled
* Use unittest.skipUnless(os.name == "nt", ...) on test_GetLastError()
........
r80564 | victor.stinner | 2010-04-28 00:59:35 +0200 (mer., 28 avril 2010) | 4 lines
Issue #7449, part 6: fix test_hashlib for missing threading module
Move @test_support.reap_thread decorator from test_main() to test_threaded_hashing().
........
r80565 | victor.stinner | 2010-04-28 01:01:29 +0200 (mer., 28 avril 2010) | 6 lines
Issue #7449, part 7: simplify threading detection in test_capi
* Skip TestPendingCalls if threading module is missing
* Test if threading module is present or not, instead of test the presence of
_testcapi._test_thread_state
........
r80566 | victor.stinner | 2010-04-28 01:03:16 +0200 (mer., 28 avril 2010) | 4 lines
Issue #7449, part 8: don't skip the whole test_asynchat if threading is missing
TestFifo can be executed without the threading module
........
r80568 | victor.stinner | 2010-04-28 01:14:58 +0200 (mer., 28 avril 2010) | 6 lines
Issue #7449, part 9: fix test_xmlrpclib for missing threading module
* Skip testcases using threads if threading module is missing
* Use "http://" instead of URL in ServerProxyTestCase if threading is missing
because URL is not set in this case
........
r80569 | victor.stinner | 2010-04-28 01:33:58 +0200 (mer., 28 avril 2010) | 6 lines
Partial revert of r80556 (Issue #7449, part 5, fix ctypes test)
Rewrite r80556: the thread test have to be executed just after the test on
libc_open() and so the test cannot be splitted in two functions (without
duplicating code, and I don't want to duplicate code).
........
r80570 | victor.stinner | 2010-04-28 01:51:16 +0200 (mer., 28 avril 2010) | 8 lines
Issue #7449, part 10: test_cmd imports trace module using test_support.import_module()
Use test_support.import_module() instead of import to raise a SkipTest
exception if the import fail. Import trace fails if the threading module is
missing.
See also part 3: test_doctest: import trace module in test_coverage().
........
r80571 | victor.stinner | 2010-04-28 01:55:59 +0200 (mer., 28 avril 2010) | 6 lines
Issue #7449, last part (11): fix many tests if thread support is disabled
* Use try/except ImportError or test_support.import_module() to import thread
and threading modules
* Add @unittest.skipUnless(threading, ...) to testcases using threads
........
2010-04-28 22:31:17 +00:00
|
|
|
threading = support.import_module('threading')
|
2002-04-19 00:11:32 +00:00
|
|
|
|
2004-08-20 02:37:25 +00:00
|
|
|
QUEUE_SIZE = 5
|
2002-04-19 00:11:32 +00:00
|
|
|
|
2008-01-14 21:39:24 +00:00
|
|
|
def qfull(q):
|
|
|
|
|
return q.maxsize > 0 and q.qsize() == q.maxsize
|
|
|
|
|
|
2004-08-20 02:37:25 +00:00
|
|
|
# A thread to run a function that unclogs a blocked Queue.
|
2002-04-19 00:11:32 +00:00
|
|
|
class _TriggerThread(threading.Thread):
|
|
|
|
|
def __init__(self, fn, args):
|
|
|
|
|
self.fn = fn
|
|
|
|
|
self.args = args
|
|
|
|
|
self.startedEvent = threading.Event()
|
|
|
|
|
threading.Thread.__init__(self)
|
2004-08-20 02:37:25 +00:00
|
|
|
|
2002-04-19 00:11:32 +00:00
|
|
|
def run(self):
|
2004-08-20 03:27:12 +00:00
|
|
|
# The sleep isn't necessary, but is intended to give the blocking
|
|
|
|
|
# function in the main thread a chance at actually blocking before
|
|
|
|
|
# we unclog it. But if the sleep is longer than the timeout-based
|
|
|
|
|
# tests wait in their blocking functions, those tests will fail.
|
|
|
|
|
# So we give them much longer timeout values compared to the
|
|
|
|
|
# sleep here (I aimed at 10 seconds for blocking functions --
|
|
|
|
|
# they should never actually wait that long - they should make
|
|
|
|
|
# progress as soon as we call self.fn()).
|
|
|
|
|
time.sleep(0.1)
|
2002-04-19 00:11:32 +00:00
|
|
|
self.startedEvent.set()
|
|
|
|
|
self.fn(*self.args)
|
|
|
|
|
|
2004-08-20 03:27:12 +00:00
|
|
|
|
2008-02-05 18:48:51 +00:00
|
|
|
# Execute a function that blocks, and in a separate thread, a function that
|
|
|
|
|
# triggers the release. Returns the result of the blocking function. Caution:
|
|
|
|
|
# block_func must guarantee to block until trigger_func is called, and
|
|
|
|
|
# trigger_func must guarantee to change queue state so that block_func can make
|
|
|
|
|
# enough progress to return. In particular, a block_func that just raises an
|
|
|
|
|
# exception regardless of whether trigger_func is called will lead to
|
|
|
|
|
# timing-dependent sporadic failures, and one of those went rarely seen but
|
|
|
|
|
# undiagnosed for years. Now block_func must be unexceptional. If block_func
|
|
|
|
|
# is supposed to raise an exception, call do_exceptional_blocking_test()
|
|
|
|
|
# instead.
|
|
|
|
|
|
|
|
|
|
class BlockingTestMixin:
|
|
|
|
|
|
2013-03-23 23:35:06 +02:00
|
|
|
def tearDown(self):
|
|
|
|
|
self.t = None
|
|
|
|
|
|
2008-02-05 18:48:51 +00:00
|
|
|
def do_blocking_test(self, block_func, block_args, trigger_func, trigger_args):
|
|
|
|
|
self.t = _TriggerThread(trigger_func, trigger_args)
|
|
|
|
|
self.t.start()
|
|
|
|
|
self.result = block_func(*block_args)
|
|
|
|
|
# If block_func returned before our thread made the call, we failed!
|
2008-06-11 19:14:14 +00:00
|
|
|
if not self.t.startedEvent.is_set():
|
2008-02-05 18:48:51 +00:00
|
|
|
self.fail("blocking function '%r' appeared not to block" %
|
|
|
|
|
block_func)
|
|
|
|
|
self.t.join(10) # make sure the thread terminates
|
2008-06-11 19:14:14 +00:00
|
|
|
if self.t.is_alive():
|
2008-02-05 18:48:51 +00:00
|
|
|
self.fail("trigger function '%r' appeared to not return" %
|
|
|
|
|
trigger_func)
|
|
|
|
|
return self.result
|
|
|
|
|
|
|
|
|
|
# Call this instead if block_func is supposed to raise an exception.
|
|
|
|
|
def do_exceptional_blocking_test(self,block_func, block_args, trigger_func,
|
|
|
|
|
trigger_args, expected_exception_class):
|
|
|
|
|
self.t = _TriggerThread(trigger_func, trigger_args)
|
|
|
|
|
self.t.start()
|
2004-08-20 03:27:12 +00:00
|
|
|
try:
|
2008-02-05 18:48:51 +00:00
|
|
|
try:
|
|
|
|
|
block_func(*block_args)
|
|
|
|
|
except expected_exception_class:
|
|
|
|
|
raise
|
|
|
|
|
else:
|
|
|
|
|
self.fail("expected exception of kind %r" %
|
|
|
|
|
expected_exception_class)
|
|
|
|
|
finally:
|
|
|
|
|
self.t.join(10) # make sure the thread terminates
|
2008-06-11 19:14:14 +00:00
|
|
|
if self.t.is_alive():
|
2008-02-05 18:48:51 +00:00
|
|
|
self.fail("trigger function '%r' appeared to not return" %
|
|
|
|
|
trigger_func)
|
2008-06-11 19:14:14 +00:00
|
|
|
if not self.t.startedEvent.is_set():
|
2008-02-05 18:48:51 +00:00
|
|
|
self.fail("trigger thread ended but event never set")
|
|
|
|
|
|
|
|
|
|
|
2012-03-17 16:38:39 -04:00
|
|
|
class BaseQueueTestMixin(BlockingTestMixin):
|
2008-02-05 18:48:51 +00:00
|
|
|
def setUp(self):
|
|
|
|
|
self.cum = 0
|
|
|
|
|
self.cumlock = threading.Lock()
|
|
|
|
|
|
|
|
|
|
def simple_queue_test(self, q):
|
|
|
|
|
if q.qsize():
|
|
|
|
|
raise RuntimeError("Call this function with an empty queue")
|
2010-07-23 16:56:21 +00:00
|
|
|
self.assertTrue(q.empty())
|
|
|
|
|
self.assertFalse(q.full())
|
2008-02-05 18:48:51 +00:00
|
|
|
# I guess we better check things actually queue correctly a little :)
|
|
|
|
|
q.put(111)
|
|
|
|
|
q.put(333)
|
|
|
|
|
q.put(222)
|
|
|
|
|
target_order = dict(Queue = [111, 333, 222],
|
|
|
|
|
LifoQueue = [222, 333, 111],
|
|
|
|
|
PriorityQueue = [111, 222, 333])
|
|
|
|
|
actual_order = [q.get(), q.get(), q.get()]
|
2010-11-20 19:04:17 +00:00
|
|
|
self.assertEqual(actual_order, target_order[q.__class__.__name__],
|
|
|
|
|
"Didn't seem to queue the correct data!")
|
2008-02-05 18:48:51 +00:00
|
|
|
for i in range(QUEUE_SIZE-1):
|
|
|
|
|
q.put(i)
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(q.qsize(), "Queue should not be empty")
|
|
|
|
|
self.assertTrue(not qfull(q), "Queue should not be full")
|
2008-02-05 18:48:51 +00:00
|
|
|
last = 2 * QUEUE_SIZE
|
|
|
|
|
full = 3 * 2 * QUEUE_SIZE
|
|
|
|
|
q.put(last)
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(qfull(q), "Queue should be full")
|
2010-07-23 16:56:21 +00:00
|
|
|
self.assertFalse(q.empty())
|
|
|
|
|
self.assertTrue(q.full())
|
2008-02-05 18:48:51 +00:00
|
|
|
try:
|
|
|
|
|
q.put(full, block=0)
|
|
|
|
|
self.fail("Didn't appear to block with a full queue")
|
2008-05-11 19:59:59 +00:00
|
|
|
except queue.Full:
|
2008-02-05 18:48:51 +00:00
|
|
|
pass
|
|
|
|
|
try:
|
|
|
|
|
q.put(full, timeout=0.01)
|
|
|
|
|
self.fail("Didn't appear to time-out with a full queue")
|
2008-05-11 19:59:59 +00:00
|
|
|
except queue.Full:
|
2008-02-05 18:48:51 +00:00
|
|
|
pass
|
|
|
|
|
# Test a blocking put
|
|
|
|
|
self.do_blocking_test(q.put, (full,), q.get, ())
|
|
|
|
|
self.do_blocking_test(q.put, (full, True, 10), q.get, ())
|
|
|
|
|
# Empty it
|
|
|
|
|
for i in range(QUEUE_SIZE):
|
|
|
|
|
q.get()
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(not q.qsize(), "Queue should be empty")
|
2008-02-05 18:48:51 +00:00
|
|
|
try:
|
|
|
|
|
q.get(block=0)
|
|
|
|
|
self.fail("Didn't appear to block with an empty queue")
|
2008-05-11 19:59:59 +00:00
|
|
|
except queue.Empty:
|
2008-02-05 18:48:51 +00:00
|
|
|
pass
|
|
|
|
|
try:
|
|
|
|
|
q.get(timeout=0.01)
|
|
|
|
|
self.fail("Didn't appear to time-out with an empty queue")
|
2008-05-11 19:59:59 +00:00
|
|
|
except queue.Empty:
|
2008-02-05 18:48:51 +00:00
|
|
|
pass
|
|
|
|
|
# Test a blocking get
|
|
|
|
|
self.do_blocking_test(q.get, (), q.put, ('empty',))
|
|
|
|
|
self.do_blocking_test(q.get, (True, 10), q.put, ('empty',))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def worker(self, q):
|
|
|
|
|
while True:
|
|
|
|
|
x = q.get()
|
2008-04-01 21:23:34 +00:00
|
|
|
if x < 0:
|
2008-02-05 18:48:51 +00:00
|
|
|
q.task_done()
|
|
|
|
|
return
|
|
|
|
|
with self.cumlock:
|
|
|
|
|
self.cum += x
|
|
|
|
|
q.task_done()
|
|
|
|
|
|
|
|
|
|
def queue_join_test(self, q):
|
|
|
|
|
self.cum = 0
|
|
|
|
|
for i in (0,1):
|
|
|
|
|
threading.Thread(target=self.worker, args=(q,)).start()
|
|
|
|
|
for i in range(100):
|
|
|
|
|
q.put(i)
|
|
|
|
|
q.join()
|
2010-11-20 19:04:17 +00:00
|
|
|
self.assertEqual(self.cum, sum(range(100)),
|
|
|
|
|
"q.join() did not block until all tasks were done")
|
2008-04-01 21:23:34 +00:00
|
|
|
for i in (0,1):
|
|
|
|
|
q.put(-1) # instruct the threads to close
|
2008-02-05 18:48:51 +00:00
|
|
|
q.join() # verify that you can join twice
|
|
|
|
|
|
|
|
|
|
def test_queue_task_done(self):
|
|
|
|
|
# Test to make sure a queue task completed successfully.
|
|
|
|
|
q = self.type2test()
|
|
|
|
|
try:
|
|
|
|
|
q.task_done()
|
|
|
|
|
except ValueError:
|
|
|
|
|
pass
|
2004-08-20 03:27:12 +00:00
|
|
|
else:
|
2008-02-05 18:48:51 +00:00
|
|
|
self.fail("Did not detect task count going negative")
|
|
|
|
|
|
|
|
|
|
def test_queue_join(self):
|
|
|
|
|
# Test that a queue join()s successfully, and before anything else
|
|
|
|
|
# (done twice for insurance).
|
|
|
|
|
q = self.type2test()
|
|
|
|
|
self.queue_join_test(q)
|
|
|
|
|
self.queue_join_test(q)
|
|
|
|
|
try:
|
|
|
|
|
q.task_done()
|
|
|
|
|
except ValueError:
|
|
|
|
|
pass
|
|
|
|
|
else:
|
|
|
|
|
self.fail("Did not detect task count going negative")
|
|
|
|
|
|
|
|
|
|
def test_simple_queue(self):
|
|
|
|
|
# Do it a couple of times on the same queue.
|
|
|
|
|
# Done twice to make sure works with same instance reused.
|
|
|
|
|
q = self.type2test(QUEUE_SIZE)
|
|
|
|
|
self.simple_queue_test(q)
|
|
|
|
|
self.simple_queue_test(q)
|
|
|
|
|
|
2010-07-23 16:56:21 +00:00
|
|
|
def test_negative_timeout_raises_exception(self):
|
|
|
|
|
q = self.type2test(QUEUE_SIZE)
|
|
|
|
|
with self.assertRaises(ValueError):
|
|
|
|
|
q.put(1, timeout=-1)
|
|
|
|
|
with self.assertRaises(ValueError):
|
|
|
|
|
q.get(1, timeout=-1)
|
|
|
|
|
|
|
|
|
|
def test_nowait(self):
|
|
|
|
|
q = self.type2test(QUEUE_SIZE)
|
|
|
|
|
for i in range(QUEUE_SIZE):
|
|
|
|
|
q.put_nowait(1)
|
|
|
|
|
with self.assertRaises(queue.Full):
|
|
|
|
|
q.put_nowait(1)
|
|
|
|
|
|
|
|
|
|
for i in range(QUEUE_SIZE):
|
|
|
|
|
q.get_nowait()
|
|
|
|
|
with self.assertRaises(queue.Empty):
|
|
|
|
|
q.get_nowait()
|
|
|
|
|
|
2010-10-31 17:57:52 +00:00
|
|
|
def test_shrinking_queue(self):
|
|
|
|
|
# issue 10110
|
|
|
|
|
q = self.type2test(3)
|
|
|
|
|
q.put(1)
|
|
|
|
|
q.put(2)
|
|
|
|
|
q.put(3)
|
|
|
|
|
with self.assertRaises(queue.Full):
|
|
|
|
|
q.put_nowait(4)
|
|
|
|
|
self.assertEqual(q.qsize(), 3)
|
|
|
|
|
q.maxsize = 2 # shrink the queue
|
|
|
|
|
with self.assertRaises(queue.Full):
|
|
|
|
|
q.put_nowait(4)
|
2008-02-05 18:48:51 +00:00
|
|
|
|
2012-03-17 16:38:39 -04:00
|
|
|
class QueueTest(BaseQueueTestMixin, unittest.TestCase):
|
2008-05-11 19:59:59 +00:00
|
|
|
type2test = queue.Queue
|
2008-02-05 18:48:51 +00:00
|
|
|
|
2012-03-17 16:38:39 -04:00
|
|
|
class LifoQueueTest(BaseQueueTestMixin, unittest.TestCase):
|
2008-05-11 19:59:59 +00:00
|
|
|
type2test = queue.LifoQueue
|
2008-02-05 18:48:51 +00:00
|
|
|
|
2012-03-17 16:38:39 -04:00
|
|
|
class PriorityQueueTest(BaseQueueTestMixin, unittest.TestCase):
|
2008-05-11 19:59:59 +00:00
|
|
|
type2test = queue.PriorityQueue
|
2008-02-05 18:48:51 +00:00
|
|
|
|
|
|
|
|
|
2002-04-19 00:11:32 +00:00
|
|
|
|
|
|
|
|
# A Queue subclass that can provoke failure at a moment's notice :)
|
|
|
|
|
class FailingQueueException(Exception):
|
|
|
|
|
pass
|
|
|
|
|
|
2008-05-11 19:59:59 +00:00
|
|
|
class FailingQueue(queue.Queue):
|
2002-04-19 00:11:32 +00:00
|
|
|
def __init__(self, *args):
|
|
|
|
|
self.fail_next_put = False
|
|
|
|
|
self.fail_next_get = False
|
2008-05-11 19:59:59 +00:00
|
|
|
queue.Queue.__init__(self, *args)
|
2002-04-19 00:11:32 +00:00
|
|
|
def _put(self, item):
|
|
|
|
|
if self.fail_next_put:
|
|
|
|
|
self.fail_next_put = False
|
2007-08-29 23:37:32 +00:00
|
|
|
raise FailingQueueException("You Lose")
|
2008-05-11 19:59:59 +00:00
|
|
|
return queue.Queue._put(self, item)
|
2002-04-19 00:11:32 +00:00
|
|
|
def _get(self):
|
|
|
|
|
if self.fail_next_get:
|
|
|
|
|
self.fail_next_get = False
|
2007-08-29 23:37:32 +00:00
|
|
|
raise FailingQueueException("You Lose")
|
2008-05-11 19:59:59 +00:00
|
|
|
return queue.Queue._get(self)
|
2002-04-19 00:11:32 +00:00
|
|
|
|
2013-03-23 23:35:06 +02:00
|
|
|
class FailingQueueTest(BlockingTestMixin, unittest.TestCase):
|
2002-04-19 00:11:32 +00:00
|
|
|
|
2008-02-05 18:48:51 +00:00
|
|
|
def failing_queue_test(self, q):
|
|
|
|
|
if q.qsize():
|
|
|
|
|
raise RuntimeError("Call this function with an empty queue")
|
|
|
|
|
for i in range(QUEUE_SIZE-1):
|
|
|
|
|
q.put(i)
|
|
|
|
|
# Test a failing non-blocking put.
|
|
|
|
|
q.fail_next_put = True
|
2006-04-21 10:40:58 +00:00
|
|
|
try:
|
2008-02-05 18:48:51 +00:00
|
|
|
q.put("oops", block=0)
|
|
|
|
|
self.fail("The queue didn't fail when it should have")
|
|
|
|
|
except FailingQueueException:
|
|
|
|
|
pass
|
|
|
|
|
q.fail_next_put = True
|
|
|
|
|
try:
|
|
|
|
|
q.put("oops", timeout=0.1)
|
|
|
|
|
self.fail("The queue didn't fail when it should have")
|
|
|
|
|
except FailingQueueException:
|
|
|
|
|
pass
|
|
|
|
|
q.put("last")
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(qfull(q), "Queue should be full")
|
2008-02-05 18:48:51 +00:00
|
|
|
# Test a failing blocking put
|
|
|
|
|
q.fail_next_put = True
|
|
|
|
|
try:
|
|
|
|
|
self.do_blocking_test(q.put, ("full",), q.get, ())
|
|
|
|
|
self.fail("The queue didn't fail when it should have")
|
|
|
|
|
except FailingQueueException:
|
|
|
|
|
pass
|
|
|
|
|
# Check the Queue isn't damaged.
|
|
|
|
|
# put failed, but get succeeded - re-add
|
|
|
|
|
q.put("last")
|
|
|
|
|
# Test a failing timeout put
|
|
|
|
|
q.fail_next_put = True
|
|
|
|
|
try:
|
|
|
|
|
self.do_exceptional_blocking_test(q.put, ("full", True, 10), q.get, (),
|
|
|
|
|
FailingQueueException)
|
|
|
|
|
self.fail("The queue didn't fail when it should have")
|
|
|
|
|
except FailingQueueException:
|
|
|
|
|
pass
|
|
|
|
|
# Check the Queue isn't damaged.
|
|
|
|
|
# put failed, but get succeeded - re-add
|
|
|
|
|
q.put("last")
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(qfull(q), "Queue should be full")
|
2008-02-05 18:48:51 +00:00
|
|
|
q.get()
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(not qfull(q), "Queue should not be full")
|
2008-02-05 18:48:51 +00:00
|
|
|
q.put("last")
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(qfull(q), "Queue should be full")
|
2008-02-05 18:48:51 +00:00
|
|
|
# Test a blocking put
|
|
|
|
|
self.do_blocking_test(q.put, ("full",), q.get, ())
|
|
|
|
|
# Empty it
|
|
|
|
|
for i in range(QUEUE_SIZE):
|
|
|
|
|
q.get()
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(not q.qsize(), "Queue should be empty")
|
2008-02-05 18:48:51 +00:00
|
|
|
q.put("first")
|
|
|
|
|
q.fail_next_get = True
|
|
|
|
|
try:
|
|
|
|
|
q.get()
|
|
|
|
|
self.fail("The queue didn't fail when it should have")
|
|
|
|
|
except FailingQueueException:
|
|
|
|
|
pass
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(q.qsize(), "Queue should not be empty")
|
2008-02-05 18:48:51 +00:00
|
|
|
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
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(q.qsize(), "Queue should not be empty")
|
2008-02-05 18:48:51 +00:00
|
|
|
q.get()
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(not q.qsize(), "Queue should be empty")
|
2008-02-05 18:48:51 +00:00
|
|
|
q.fail_next_get = True
|
|
|
|
|
try:
|
|
|
|
|
self.do_exceptional_blocking_test(q.get, (), q.put, ('empty',),
|
|
|
|
|
FailingQueueException)
|
|
|
|
|
self.fail("The queue didn't fail when it should have")
|
|
|
|
|
except FailingQueueException:
|
|
|
|
|
pass
|
|
|
|
|
# put succeeded, but get failed.
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(q.qsize(), "Queue should not be empty")
|
2008-02-05 18:48:51 +00:00
|
|
|
q.get()
|
2009-06-30 23:06:06 +00:00
|
|
|
self.assertTrue(not q.qsize(), "Queue should be empty")
|
2006-04-21 10:40:58 +00:00
|
|
|
|
2008-02-05 18:48:51 +00:00
|
|
|
def test_failing_queue(self):
|
|
|
|
|
# Test to make sure a queue is functioning correctly.
|
|
|
|
|
# Done twice to the same instance.
|
|
|
|
|
q = FailingQueue(QUEUE_SIZE)
|
|
|
|
|
self.failing_queue_test(q)
|
|
|
|
|
self.failing_queue_test(q)
|
2006-04-21 10:40:58 +00:00
|
|
|
|
|
|
|
|
|
2008-02-05 18:48:51 +00:00
|
|
|
def test_main():
|
2008-05-20 21:35:26 +00:00
|
|
|
support.run_unittest(QueueTest, LifoQueueTest, PriorityQueueTest,
|
2008-02-05 18:48:51 +00:00
|
|
|
FailingQueueTest)
|
Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59987 | raymond.hettinger | 2008-01-15 21:52:42 +0100 (Tue, 15 Jan 2008) | 1 line
Refactor if/elif chain for clarity and speed. Remove dependency on subclasses having to implement _empty and _full.
........
r59988 | raymond.hettinger | 2008-01-15 22:22:47 +0100 (Tue, 15 Jan 2008) | 1 line
Fix-up half-written paragraph in the docs
........
r59989 | amaury.forgeotdarc | 2008-01-15 22:25:11 +0100 (Tue, 15 Jan 2008) | 3 lines
test_doctest fails since r59984.
Not sure if these are the correct values, but save_stdout has to be set before its usage...
........
r59992 | andrew.kuchling | 2008-01-16 01:32:03 +0100 (Wed, 16 Jan 2008) | 1 line
Docstring typos
........
r59993 | andrew.kuchling | 2008-01-16 04:17:25 +0100 (Wed, 16 Jan 2008) | 1 line
Add PEP 3141 section
........
r59998 | andrew.kuchling | 2008-01-16 14:01:51 +0100 (Wed, 16 Jan 2008) | 1 line
Markup fix
........
r59999 | georg.brandl | 2008-01-16 17:56:29 +0100 (Wed, 16 Jan 2008) | 2 lines
Fix MSDN library URL. (#1854)
........
r60006 | georg.brandl | 2008-01-16 21:27:56 +0100 (Wed, 16 Jan 2008) | 3 lines
Add Python-specific content to Doc dir. Update configuration file
to work with the newest Sphinx.
........
r60007 | georg.brandl | 2008-01-16 21:29:00 +0100 (Wed, 16 Jan 2008) | 2 lines
Doc build should work with 2.4 now.
........
r60009 | raymond.hettinger | 2008-01-17 00:38:16 +0100 (Thu, 17 Jan 2008) | 1 line
Minor wordsmithing.
........
r60010 | raymond.hettinger | 2008-01-17 00:40:45 +0100 (Thu, 17 Jan 2008) | 1 line
Add queues will alternative fetch orders (priority based and stack based).
........
r60011 | raymond.hettinger | 2008-01-17 00:49:35 +0100 (Thu, 17 Jan 2008) | 1 line
Add news entry.
........
r60013 | raymond.hettinger | 2008-01-17 04:02:14 +0100 (Thu, 17 Jan 2008) | 1 line
Make starmap() match its pure python definition and accept any itertable input (not just tuples).
........
r60015 | gregory.p.smith | 2008-01-17 08:43:20 +0100 (Thu, 17 Jan 2008) | 3 lines
Comply with RFC 3207.
Fixes issue 829951 - http://bugs.python.org/issue829951
........
r60018 | gregory.p.smith | 2008-01-17 09:03:17 +0100 (Thu, 17 Jan 2008) | 2 lines
entry for r60015
........
r60019 | raymond.hettinger | 2008-01-17 09:07:05 +0100 (Thu, 17 Jan 2008) | 1 line
Note versionadded.
........
r60020 | gregory.p.smith | 2008-01-17 09:35:49 +0100 (Thu, 17 Jan 2008) | 8 lines
Fixes (accepts patch) issue1339 - http://bugs.python.org/issue1339
- Factor out the duplication of EHLO/HELO in login() and sendmail() to
a new function, ehlo_or_helo_if_needed().
- Use ehlo_or_helo_if_needed() in starttls()
- Check for the starttls exception in starttls() in the same way as
login() checks for the auth extension.
Contributed by Bill Fenner.
........
r60021 | andrew.kuchling | 2008-01-17 13:00:15 +0100 (Thu, 17 Jan 2008) | 1 line
Revise 3141 section a bit; add some Windows items
........
r60022 | brett.cannon | 2008-01-17 19:45:10 +0100 (Thu, 17 Jan 2008) | 2 lines
Fix a function pointer declaration to silence the compiler.
........
r60024 | raymond.hettinger | 2008-01-17 20:31:38 +0100 (Thu, 17 Jan 2008) | 1 line
Issue #1861: Add read-only attribute listing upcoming events in the order they will be run.
........
r60025 | andrew.kuchling | 2008-01-17 20:49:24 +0100 (Thu, 17 Jan 2008) | 1 line
Correction from Jordan Lewis: halfdelay() uses tenths of a second, not milliseconds
........
r60026 | raymond.hettinger | 2008-01-17 23:27:49 +0100 (Thu, 17 Jan 2008) | 1 line
Add advice on choosing between scheduler and threading.Timer().
........
r60028 | christian.heimes | 2008-01-18 00:01:44 +0100 (Fri, 18 Jan 2008) | 2 lines
Updated new property syntax. An elaborate example for subclassing and the getter was missing.
Added comment about VS 2008 and PGO builds.
........
r60029 | raymond.hettinger | 2008-01-18 00:32:01 +0100 (Fri, 18 Jan 2008) | 1 line
Fix-up Timer() example.
........
r60030 | raymond.hettinger | 2008-01-18 00:56:56 +0100 (Fri, 18 Jan 2008) | 1 line
Fix markup
........
r60031 | raymond.hettinger | 2008-01-18 01:10:42 +0100 (Fri, 18 Jan 2008) | 1 line
clearcache() needs to remove the dict as well as clear it.
........
r60033 | andrew.kuchling | 2008-01-18 03:26:16 +0100 (Fri, 18 Jan 2008) | 1 line
Bump verson
........
r60034 | andrew.kuchling | 2008-01-18 03:42:52 +0100 (Fri, 18 Jan 2008) | 1 line
Typo fix
........
r60035 | christian.heimes | 2008-01-18 08:30:20 +0100 (Fri, 18 Jan 2008) | 3 lines
Coverity issue CID #197
var_decl: Declared variable "stm" without initializer
ninit_use_in_call: Using uninitialized value "stm" (field "stm".tm_zone uninitialized) in call to function "mktime"
........
r60036 | christian.heimes | 2008-01-18 08:45:30 +0100 (Fri, 18 Jan 2008) | 11 lines
Coverity issue CID #167
Event alloc_fn: Called allocation function "metacompile" [model]
Event var_assign: Assigned variable "gr" to storage returned from "metacompile"
gr = metacompile(n);
Event pass_arg: Variable "gr" not freed or pointed-to in function "maketables" [model]
g = maketables(gr);
translatelabels(g);
addfirstsets(g);
Event leaked_storage: Returned without freeing storage "gr"
return g;
........
r60038 | christian.heimes | 2008-01-18 09:04:57 +0100 (Fri, 18 Jan 2008) | 3 lines
Coverity issue CID #182
size_error: Allocating 1 bytes to pointer "children", which needs at least 4 bytes
........
r60041 | christian.heimes | 2008-01-18 09:47:59 +0100 (Fri, 18 Jan 2008) | 4 lines
Coverity issue CID #169
local_ptr_assign_local: Assigning address of stack variable "namebuf" to pointer "filename"
out_of_scope: Variable "namebuf" goes out of scope
use_invalid: Used "filename" pointing to out-of-scope variable "namebuf"
........
r60042 | christian.heimes | 2008-01-18 09:53:45 +0100 (Fri, 18 Jan 2008) | 2 lines
Coverity CID #168
leaked_storage: Returned without freeing storage "fp"
........
2008-01-18 09:56:22 +00:00
|
|
|
|
2006-04-21 10:40:58 +00:00
|
|
|
|
2008-02-05 18:48:51 +00:00
|
|
|
if __name__ == "__main__":
|
|
|
|
|
test_main()
|