summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-03-17 20:38:39 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-03-17 20:38:39 (GMT)
commitc6bfce9871a1ed53e06da04c1b7c6cf02a08df77 (patch)
treeb0cae0f3adb6d3b9e2b17571e442d8809ef538aa
parent5ab88177a468d25ad5132408340a66a43b7d4be3 (diff)
downloadcpython-c6bfce9871a1ed53e06da04c1b7c6cf02a08df77.zip
cpython-c6bfce9871a1ed53e06da04c1b7c6cf02a08df77.tar.gz
cpython-c6bfce9871a1ed53e06da04c1b7c6cf02a08df77.tar.bz2
#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 8287a5d..86ad9c0 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