summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-03-17 16:39:44 -0400
committerR David Murray <rdmurray@bitdance.com>2012-03-17 16:39:44 -0400
commit0863d7106c6b4756cb726cfe838c2dc3f2b11f3c (patch)
treeaada3eb7730fe3954bcc092b82b286e220e09bb5
parentbd53809ee7776287370d4219eec8f8d1dccae49d (diff)
parentc6bfce9871a1ed53e06da04c1b7c6cf02a08df77 (diff)
downloadcpython-git-0863d7106c6b4756cb726cfe838c2dc3f2b11f3c.tar.gz
Merge #14333: fix test_queue so it can be run via standard unittest test discovery.
-rw-r--r--Lib/test/test_queue.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
index 8287a5ddf6..86ad9c0765 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