diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-23 21:37:38 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-23 21:37:38 (GMT) |
| commit | 23c31d51928f82430fe5f0f39ca2141534d3a8bb (patch) | |
| tree | a034690cfb3afc24688d35d24b4734951b9d65f5 | |
| parent | 64c16c3311d6ef8077498096e8874756477027de (diff) | |
| parent | 93f756b274fb376d4c7fe589b1211acb49cea092 (diff) | |
| download | cpython-23c31d51928f82430fe5f0f39ca2141534d3a8bb.zip cpython-23c31d51928f82430fe5f0f39ca2141534d3a8bb.tar.gz cpython-23c31d51928f82430fe5f0f39ca2141534d3a8bb.tar.bz2 | |
Merge test_queue clean up from 3.3.
| -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 86ad9c0..2cdfee4 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(): |