diff options
| author | Georg Brandl <georg@python.org> | 2013-03-25 07:01:37 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-03-25 07:01:37 +0100 |
| commit | a809e4a54007303efb084b85ba53605adaa41b64 (patch) | |
| tree | d038bc1b85b83594b29f00ae5bc10b5290ffdf71 /Lib/test/test_queue.py | |
| parent | d08d0b1c69b19c58afb998e30eadfc7b9de26378 (diff) | |
| parent | 153866ea9ab80323d247a9c49d1fdf50e07e7330 (diff) | |
| download | cpython-git-3.3.1rc1.tar.gz | |
merge with upstream 3.3 branchv3.3.1rc1
Diffstat (limited to 'Lib/test/test_queue.py')
| -rw-r--r-- | Lib/test/test_queue.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py index 86ad9c0765..2cdfee4008 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -46,6 +46,9 @@ class _TriggerThread(threading.Thread): class BlockingTestMixin: + def tearDown(self): + self.t = None + def do_blocking_test(self, block_func, block_args, trigger_func, trigger_args): self.t = _TriggerThread(trigger_func, trigger_args) self.t.start() @@ -260,7 +263,7 @@ class FailingQueue(queue.Queue): raise FailingQueueException("You Lose") return queue.Queue._get(self) -class FailingQueueTest(unittest.TestCase, BlockingTestMixin): +class FailingQueueTest(BlockingTestMixin, unittest.TestCase): def failing_queue_test(self, q): if q.qsize(): |