From: R David Murray Date: Sat, 17 Mar 2012 20:44:16 +0000 (-0400) Subject: #14333: fix test_queue so it can be run via standard unittest test discovery. X-Git-Tag: v2.7.4rc1~958^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c2689a00c60fc0584baa1597998d40b2d6cfbed;p=python #14333: fix test_queue so it can be run via standard unittest test discovery. --- diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py index 0b38e7e306..f821db689c 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -79,7 +79,7 @@ class BlockingTestMixin: self.fail("trigger thread ended but event never set") -class BaseQueueTest(unittest.TestCase, BlockingTestMixin): +class BaseQueueTest(BlockingTestMixin): def setUp(self): self.cum = 0 self.cumlock = threading.Lock() @@ -191,13 +191,13 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin): self.simple_queue_test(q) -class QueueTest(BaseQueueTest): +class QueueTest(BaseQueueTest, unittest.TestCase): type2test = Queue.Queue -class LifoQueueTest(BaseQueueTest): +class LifoQueueTest(BaseQueueTest, unittest.TestCase): type2test = Queue.LifoQueue -class PriorityQueueTest(BaseQueueTest): +class PriorityQueueTest(BaseQueueTest, unittest.TestCase): type2test = Queue.PriorityQueue