diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 13:34:58 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-11-21 13:34:58 (GMT) |
| commit | 2623a37852153363335956afab010cb0beb7e74e (patch) | |
| tree | e443a19bb7a87adc2158ef2e32da5c2f3b21936c /Lib/test/fork_wait.py | |
| parent | 40a92f5c65767d80ebc3b3be2c2ccfc5db3afb7b (diff) | |
| download | cpython-2623a37852153363335956afab010cb0beb7e74e.zip cpython-2623a37852153363335956afab010cb0beb7e74e.tar.gz cpython-2623a37852153363335956afab010cb0beb7e74e.tar.bz2 | |
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/fork_wait.py')
| -rw-r--r-- | Lib/test/fork_wait.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/fork_wait.py b/Lib/test/fork_wait.py index cc51f89..2646cbd 100644 --- a/Lib/test/fork_wait.py +++ b/Lib/test/fork_wait.py @@ -43,8 +43,8 @@ class ForkWait(unittest.TestCase): break time.sleep(2 * SHORTSLEEP) - self.assertEquals(spid, cpid) - self.assertEquals(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8)) + self.assertEqual(spid, cpid) + self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8)) def test_wait(self): for i in range(NUM_THREADS): @@ -54,7 +54,7 @@ class ForkWait(unittest.TestCase): a = self.alive.keys() a.sort() - self.assertEquals(a, range(NUM_THREADS)) + self.assertEqual(a, range(NUM_THREADS)) prefork_lives = self.alive.copy() |