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.
........
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index f2dbdc2..2379b3e 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -276,7 +276,7 @@
# stdout is set to 1 (#1531862).
cmd = r"import sys, os; sys.exit(os.write(sys.stdout.fileno(), b'.\n'))"
rc = subprocess.call([sys.executable, "-c", cmd], stdout=1)
- self.assertEquals(rc, 2)
+ self.assertEqual(rc, 2)
def test_cwd(self):
tmpdir = tempfile.gettempdir()
@@ -566,7 +566,7 @@
"[sys.executable, '-c', 'print(\"Hello World!\")'])",
'assert retcode == 0'))
output = subprocess.check_output([sys.executable, '-c', code])
- self.assert_(output.startswith(b'Hello World!'), ascii(output))
+ self.assertTrue(output.startswith(b'Hello World!'), ascii(output))
def test_handles_closed_on_exception(self):
# If CreateProcess exits with an error, ensure the
@@ -779,7 +779,7 @@
[sys.executable, "-c", script],
env=env)
stdout = stdout.rstrip(b'\n\r')
- self.assertEquals(stdout, value_repr)
+ self.assertEqual(stdout, value_repr)
# test bytes
key = key.encode("ascii", "surrogateescape")
@@ -791,7 +791,7 @@
[sys.executable, "-c", script],
env=env)
stdout = stdout.rstrip(b'\n\r')
- self.assertEquals(stdout, value_repr)
+ self.assertEqual(stdout, value_repr)
#
# Windows tests
@@ -897,9 +897,9 @@
if os.name == 'posix':
def test_getoutput(self):
- self.assertEquals(subprocess.getoutput('echo xyzzy'), 'xyzzy')
- self.assertEquals(subprocess.getstatusoutput('echo xyzzy'),
- (0, 'xyzzy'))
+ self.assertEqual(subprocess.getoutput('echo xyzzy'), 'xyzzy')
+ self.assertEqual(subprocess.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
@@ -910,7 +910,7 @@
name = os.path.join(dir, "foo")
status, output = subprocess.getstatusoutput('cat ' + name)
- self.assertNotEquals(status, 0)
+ self.assertNotEqual(status, 0)
finally:
if dir is not None:
os.rmdir(dir)