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_socketserver.py b/Lib/test/test_socketserver.py
index d4c4f63..4825a4a 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -57,8 +57,8 @@
os._exit(72)
yield None
pid2, status = os.waitpid(pid, 0)
- testcase.assertEquals(pid2, pid)
- testcase.assertEquals(72 << 8, status)
+ testcase.assertEqual(pid2, pid)
+ testcase.assertEqual(72 << 8, status)
@unittest.skipUnless(threading, 'Threading required for this test.')
@@ -120,7 +120,7 @@
if verbose: print "creating server"
server = MyServer(addr, MyHandler)
- self.assertEquals(server.server_address, server.socket.getsockname())
+ self.assertEqual(server.server_address, server.socket.getsockname())
return server
@unittest.skipUnless(threading, 'Threading required for this test.')
@@ -161,7 +161,7 @@
while data and '\n' not in buf:
data = receive(s, 100)
buf += data
- self.assertEquals(buf, TEST_STR)
+ self.assertEqual(buf, TEST_STR)
s.close()
def dgram_examine(self, proto, addr):
@@ -171,7 +171,7 @@
while data and '\n' not in buf:
data = receive(s, 100)
buf += data
- self.assertEquals(buf, TEST_STR)
+ self.assertEqual(buf, TEST_STR)
s.close()
def test_TCPServer(self):