From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 23 Mar 2013 21:35:06 +0000 (+0200)
Subject: Clean up references to threads in test_queue.
X-Git-Tag: v2.7.5~141^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be1632beaff27b81251a40e080c6ce1f1e670fbc;p=python

Clean up references to threads in test_queue.
---

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():