From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 17 Mar 2012 20:38:39 +0000 (-0400)
Subject: #14333: fix test_queue so it can be run via standard unittest test discovery.
X-Git-Tag: v3.3.0a2~117^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6bfce9871a1ed53e06da04c1b7c6cf02a08df77;p=thirdparty%2FPython%2Fcpython.git

#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 8287a5ddf69e..86ad9c076550 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