mirror of
https://github.com/python/cpython.git
synced 2025-08-30 13:38:43 +00:00
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. ........
This commit is contained in:
parent
b65b4937e2
commit
19f2aeba67
164 changed files with 2281 additions and 2279 deletions
|
@ -155,17 +155,17 @@ class PlatformTest(unittest.TestCase):
|
|||
# On Snow Leopard, sw_vers reports 10.6.0 as 10.6
|
||||
if len_diff > 0:
|
||||
expect_list.extend(['0'] * len_diff)
|
||||
self.assertEquals(result_list, expect_list)
|
||||
self.assertEqual(result_list, expect_list)
|
||||
|
||||
# res[1] claims to contain
|
||||
# (version, dev_stage, non_release_version)
|
||||
# That information is no longer available
|
||||
self.assertEquals(res[1], ('', '', ''))
|
||||
self.assertEqual(res[1], ('', '', ''))
|
||||
|
||||
if sys.byteorder == 'little':
|
||||
self.assertEquals(res[2], 'i386')
|
||||
self.assertEqual(res[2], 'i386')
|
||||
else:
|
||||
self.assertEquals(res[2], 'PowerPC')
|
||||
self.assertEqual(res[2], 'PowerPC')
|
||||
|
||||
|
||||
@unittest.skipUnless(sys.platform == 'darwin', "OSX only test")
|
||||
|
@ -183,8 +183,8 @@ class PlatformTest(unittest.TestCase):
|
|||
else:
|
||||
# parent
|
||||
cpid, sts = os.waitpid(pid, 0)
|
||||
self.assertEquals(cpid, pid)
|
||||
self.assertEquals(sts, 0)
|
||||
self.assertEqual(cpid, pid)
|
||||
self.assertEqual(sts, 0)
|
||||
|
||||
def test_dist(self):
|
||||
res = platform.dist()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue