From c6bfce9871a1ed53e06da04c1b7c6cf02a08df77 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sat, 17 Mar 2012 16:38:39 -0400 Subject: [PATCH] #14333: fix test_queue so it can be run via standard unittest test discovery. --- Lib/test/test_queue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py index 8287a5ddf69..86ad9c07655 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -82,7 +82,7 @@ class BlockingTestMixin: self.fail("trigger thread ended but event never set") -class BaseQueueTest(unittest.TestCase, BlockingTestMixin): +class BaseQueueTestMixin(BlockingTestMixin): def setUp(self): self.cum = 0 self.cumlock = threading.Lock() @@ -229,13 +229,13 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin): with self.assertRaises(queue.Full): q.put_nowait(4) -class QueueTest(BaseQueueTest): +class QueueTest(BaseQueueTestMixin, unittest.TestCase): type2test = queue.Queue -class LifoQueueTest(BaseQueueTest): +class LifoQueueTest(BaseQueueTestMixin, unittest.TestCase): type2test = queue.LifoQueue -class PriorityQueueTest(BaseQueueTest): +class PriorityQueueTest(BaseQueueTestMixin, unittest.TestCase): type2test = queue.PriorityQueue