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:
Ezio Melotti 2010-11-21 13:34:58 +00:00
parent 40a92f5c65
commit 2623a37852
184 changed files with 2328 additions and 2326 deletions

View file

@ -24,8 +24,8 @@ if os.name != 'posix':
class CommandTests(unittest.TestCase):
def test_getoutput(self):
self.assertEquals(commands.getoutput('echo xyzzy'), 'xyzzy')
self.assertEquals(commands.getstatusoutput('echo xyzzy'), (0, 'xyzzy'))
self.assertEqual(commands.getoutput('echo xyzzy'), 'xyzzy')
self.assertEqual(commands.getstatusoutput('echo xyzzy'), (0, 'xyzzy'))
# we use mkdtemp in the next line to create an empty directory
# under our exclusive control; from that, we can invent a pathname
@ -36,7 +36,7 @@ class CommandTests(unittest.TestCase):
name = os.path.join(dir, "foo")
status, output = commands.getstatusoutput('cat ' + name)
self.assertNotEquals(status, 0)
self.assertNotEqual(status, 0)
finally:
if dir is not None:
os.rmdir(dir)