diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 13:34:58 +0000 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 13:34:58 +0000 |
| commit | 2623a37852153363335956afab010cb0beb7e74e (patch) | |
| tree | e443a19bb7a87adc2158ef2e32da5c2f3b21936c /Lib/test/test_queue.py | |
| parent | 40a92f5c65767d80ebc3b3be2c2ccfc5db3afb7b (diff) | |
| download | cpython-git-2623a37852153363335956afab010cb0beb7e74e.tar.gz | |
Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
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 5f5a6acd71..0b38e7e306 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -95,8 +95,8 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin): LifoQueue = [222, 333, 111], PriorityQueue = [111, 222, 333]) actual_order = [q.get(), q.get(), q.get()] - self.assertEquals(actual_order, target_order[q.__class__.__name__], - "Didn't seem to queue the correct data!") + self.assertEqual(actual_order, target_order[q.__class__.__name__], + "Didn't seem to queue the correct data!") for i in range(QUEUE_SIZE-1): q.put(i) self.assertTrue(not q.empty(), "Queue should not be empty") @@ -154,8 +154,8 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin): for i in xrange(100): q.put(i) q.join() - self.assertEquals(self.cum, sum(range(100)), - "q.join() did not block until all tasks were done") + self.assertEqual(self.cum, sum(range(100)), + "q.join() did not block until all tasks were done") for i in (0,1): q.put(None) # instruct the threads to close q.join() # verify that you can join twice |