]> granicus.if.org Git - python/commitdiff
#14333: fix test_queue so it can be run via standard unittest test discovery.
authorR David Murray <rdmurray@bitdance.com>
Sat, 17 Mar 2012 20:44:16 +0000 (16:44 -0400)
committerR David Murray <rdmurray@bitdance.com>
Sat, 17 Mar 2012 20:44:16 +0000 (16:44 -0400)
Lib/test/test_queue.py

index 0b38e7e306f5f8b8ff38f6657ee63dd74b8294ec..f821db689c1099ec13845bc7b258128f3fa1ac48 100644 (file)
@@ -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