Mercurial > cpython-lru_cache-weakref

diff Lib/test/test_queue.py @ 66348:614c84670c63 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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. ........
author Ezio Melotti <ezio.melotti@gmail.com>
date Sun, 21 Nov 2010 13:34:58 +0000
parents 3a0484200034
children b36cb4602e21
line wrap: on
line diff
--- a/Lib/test/test_queue.py	Sun Nov 21 00:44:27 2010 +0000
+++ b/Lib/test/test_queue.py	Sun Nov 21 13:34:58 2010 +0000
@@ -95,8 +95,8 @@
                             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 @@
         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