[Python-checkins] cpython (merge 3.3 -> default): Merge test_queue clean up from 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/1747e50fca55
changeset:   82933:1747e50fca55
parent:      82919:5a2296093645
parent:      82932:263fdce97aa0
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Mar 23 23:37:38 2013 +0200
summary:
  Merge test_queue clean up from 3.3.

files:
  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
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -46,6 +46,9 @@
 
 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 @@
             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():

-- 
Repository URL: http://hg.python.org/cpython