summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-23 21:35:06 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-23 21:35:06 (GMT)
commit656c80809c77511ed33bec9c7f6a9c09860f0116 (patch)
tree94a03c038b18ac28bb449c9a0efd2c61c7b1ab70
parenta1ed539268e37b12a4a864738b4d1e12bdb92793 (diff)
downloadcpython-656c80809c77511ed33bec9c7f6a9c09860f0116.zip
cpython-656c80809c77511ed33bec9c7f6a9c09860f0116.tar.gz
cpython-656c80809c77511ed33bec9c7f6a9c09860f0116.tar.bz2
Clean up references to threads in test_queue.
-rw-r--r--Lib/test/test_queue.py5
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():