mirror of
https://github.com/python/cpython.git
synced 2025-11-01 18:51: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
|
|
@ -123,23 +123,23 @@ class InstallTestCase(support.TempdirManager,
|
|||
|
||||
# two elements
|
||||
cmd.handle_extra_path()
|
||||
self.assertEquals(cmd.extra_path, ['path', 'dirs'])
|
||||
self.assertEquals(cmd.extra_dirs, 'dirs')
|
||||
self.assertEquals(cmd.path_file, 'path')
|
||||
self.assertEqual(cmd.extra_path, ['path', 'dirs'])
|
||||
self.assertEqual(cmd.extra_dirs, 'dirs')
|
||||
self.assertEqual(cmd.path_file, 'path')
|
||||
|
||||
# one element
|
||||
cmd.extra_path = ['path']
|
||||
cmd.handle_extra_path()
|
||||
self.assertEquals(cmd.extra_path, ['path'])
|
||||
self.assertEquals(cmd.extra_dirs, 'path')
|
||||
self.assertEquals(cmd.path_file, 'path')
|
||||
self.assertEqual(cmd.extra_path, ['path'])
|
||||
self.assertEqual(cmd.extra_dirs, 'path')
|
||||
self.assertEqual(cmd.path_file, 'path')
|
||||
|
||||
# none
|
||||
dist.extra_path = cmd.extra_path = None
|
||||
cmd.handle_extra_path()
|
||||
self.assertEquals(cmd.extra_path, None)
|
||||
self.assertEquals(cmd.extra_dirs, '')
|
||||
self.assertEquals(cmd.path_file, None)
|
||||
self.assertEqual(cmd.extra_path, None)
|
||||
self.assertEqual(cmd.extra_dirs, '')
|
||||
self.assertEqual(cmd.path_file, None)
|
||||
|
||||
# three elements (no way !)
|
||||
cmd.extra_path = 'path,dirs,again'
|
||||
|
|
@ -184,7 +184,7 @@ class InstallTestCase(support.TempdirManager,
|
|||
# line (the egg info file)
|
||||
f = open(cmd.record)
|
||||
try:
|
||||
self.assertEquals(len(f.readlines()), 1)
|
||||
self.assertEqual(len(f.readlines()), 1)
|
||||
finally:
|
||||
f.close()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue