#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:38:39 +0000 (16:38 -0400)
committerR David Murray <rdmurray@bitdance.com>
Sat, 17 Mar 2012 20:38:39 +0000 (16:38 -0400)
Lib/test/test_queue.py

index 8287a5ddf69e2824cd81c1cefe22f585aaaa8821..86ad9c076550e305796720009e4a24a5decda775 100644 (file)
@@ -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