[Python-checkins] cpython (merge 3.2 -> default): Merge #14333: fix test_queue so it can be run via standard unittest test

Sat Mar 17 21:45:35 CET 2012

http://hg.python.org/cpython/rev/3ea4d7adb3e7
changeset: 75800:3ea4d7adb3e7
parent: 75798:97b0cf9df420
parent: 75799:118f7bdd631b
user: R David Murray <rdmurray at bitdance.com>
date: Sat Mar 17 16:39:44 2012 -0400
summary:
 Merge #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
@@ -82,7 +82,7 @@
 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 @@
 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
 
 
-- 
Repository URL: http://hg.python.org/cpython
