diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-03-19 01:23:22 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-03-19 01:23:22 (GMT) |
| commit | e79499504e82e92d9aa163d18cd25a81959b0db6 (patch) | |
| tree | 0f08f770028d5bd0385b1255d1011f7594cc1501 /Lib/test/test_queue.py | |
| parent | f72ef7882c9ad5d6e1324816d630dac42ead4bc4 (diff) | |
| parent | fcdf04becc33add8bdc791466c7e96847f5335fc (diff) | |
| download | cpython-e79499504e82e92d9aa163d18cd25a81959b0db6.zip cpython-e79499504e82e92d9aa163d18cd25a81959b0db6.tar.gz cpython-e79499504e82e92d9aa163d18cd25a81959b0db6.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/test/test_queue.py')
| -rw-r--r-- | 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 index 0b38e7e..f821db6 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -79,7 +79,7 @@ class BlockingTestMixin: 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 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin): 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 |