mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 11:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 86596 via svnmerge from

Browse source 
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 01:30:29 +00:00
parent b65b4937e2
commit 19f2aeba67
164 changed files with 2281 additions and 2279 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_socketserver.py
View file

@ -57,8 +57,8 @@ def simple_subprocess(testcase):
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 @@ class SocketServerTest(unittest.TestCase):
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
def run_server(self, svrcls, hdlrbase, testfunc):
@ -159,7 +159,7 @@ class SocketServerTest(unittest.TestCase):
while data and b'\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):
@ -169,7 +169,7 @@ class SocketServerTest(unittest.TestCase):
while data and b'\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):