diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-23 23:39:25 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-23 23:39:25 +0200 |
| commit | ac982d752d0b5069835ddacf5a046cb9647a9dec (patch) | |
| tree | 7b74fa40d7b5e2d2f6cb1de2234b24b9838b5165 /Lib/test/test_queue.py | |
| parent | 2350ecd711095d4b4301656327bce47cb6fe940e (diff) | |
| parent | be1632beaff27b81251a40e080c6ce1f1e670fbc (diff) | |
| download | cpython-git-ac982d752d0b5069835ddacf5a046cb9647a9dec.tar.gz | |
Merge heads.
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 f821db689c..34a4aef198 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -43,6 +43,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() @@ -222,7 +225,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 not q.empty(): |