Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge #14333: fix test_queue so it can be run via standard unittest test discovery.

This commit is contained in:
R David Murray 2012-03-17 16:39:44 -04:00
parent bd53809ee7 c6bfce9871
commit 0863d7106c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_queue.py
View File

@ -82,7 +82,7 @@ class BlockingTestMixin:
self.fail("trigger thread ended but event never set") self.fail("trigger thread ended but event never set")
class BaseQueueTest(unittest.TestCase, BlockingTestMixin): class BaseQueueTestMixin(BlockingTestMixin):
def setUp(self): def setUp(self):
self.cum = 0 self.cum = 0
self.cumlock = threading.Lock() self.cumlock = threading.Lock()
@ -229,13 +229,13 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin):
with self.assertRaises(queue.Full): with self.assertRaises(queue.Full):
q.put_nowait(4) q.put_nowait(4)
class QueueTest(BaseQueueTest): class QueueTest(BaseQueueTestMixin, unittest.TestCase):
type2test = queue.Queue type2test = queue.Queue
class LifoQueueTest(BaseQueueTest): class LifoQueueTest(BaseQueueTestMixin, unittest.TestCase):
type2test = queue.LifoQueue type2test = queue.LifoQueue
class PriorityQueueTest(BaseQueueTest): class PriorityQueueTest(BaseQueueTestMixin, unittest.TestCase):
type2test = queue.PriorityQueue type2test = queue.PriorityQueue