[Python-checkins] cpython (2.7): #14333: fix test_queue so it can be run via standard unittest test discovery.

Sat Mar 17 21:45:36 CET 2012

http://hg.python.org/cpython/rev/340053208864
changeset: 75801:340053208864
branch: 2.7
parent: 75792:3decf67e1a28
user: R David Murray <rdmurray at bitdance.com>
date: Sat Mar 17 16:44:16 2012 -0400
summary:
 #14333: fix test_queue so it can be run via standard unittest test discovery.
files:
 Lib/test/test_queue.py | 8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -79,7 +79,7 @@
 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 @@
 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
 
 
-- 
Repository URL: http://hg.python.org/cpython
