mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-24 09:23:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

22
Lib/test/test_httplib.py
View file

@ -208,13 +208,13 @@ class BasicTest(TestCase):
sock = FakeSocket(None)
conn.sock = sock
conn.send(expected)
self.assertEquals(expected, sock.data)
self.assertEqual(expected, sock.data)
sock.data = b''
conn.send(array.array('b', expected))
self.assertEquals(expected, sock.data)
self.assertEqual(expected, sock.data)
sock.data = b''
conn.send(io.BytesIO(expected))
self.assertEquals(expected, sock.data)
self.assertEqual(expected, sock.data)
def test_chunked(self):
chunked_start = (
@ -228,7 +228,7 @@ class BasicTest(TestCase):
sock = FakeSocket(chunked_start + '0\r\n')
resp = client.HTTPResponse(sock, method="GET")
resp.begin()
self.assertEquals(resp.read(), b'hello world')
self.assertEqual(resp.read(), b'hello world')
resp.close()
for x in ('', 'foo\r\n'):
@ -238,7 +238,7 @@ class BasicTest(TestCase):
try:
resp.read()
except client.IncompleteRead as i:
self.assertEquals(i.partial, b'hello world')
self.assertEqual(i.partial, b'hello world')
self.assertEqual(repr(i),'IncompleteRead(11 bytes read)')
self.assertEqual(str(i),'IncompleteRead(11 bytes read)')
else:
@ -258,9 +258,9 @@ class BasicTest(TestCase):
sock = FakeSocket(chunked_start + '0\r\n')
resp = client.HTTPResponse(sock, method="HEAD")
resp.begin()
self.assertEquals(resp.read(), b'')
self.assertEquals(resp.status, 200)
self.assertEquals(resp.reason, 'OK')
self.assertEqual(resp.read(), b'')
self.assertEqual(resp.status, 200)
self.assertEqual(resp.reason, 'OK')
self.assertTrue(resp.isclosed())
def test_negative_content_length(self):
@ -268,7 +268,7 @@ class BasicTest(TestCase):
'HTTP/1.1 200 OK\r\nContent-Length: -1\r\n\r\nHello\r\n')
resp = client.HTTPResponse(sock, method="GET")
resp.begin()
self.assertEquals(resp.read(), b'Hello\r\n')
self.assertEqual(resp.read(), b'Hello\r\n')
resp.close()
def test_incomplete_read(self):
@ -278,7 +278,7 @@ class BasicTest(TestCase):
try:
resp.read()
except client.IncompleteRead as i:
self.assertEquals(i.partial, b'Hello\r\n')
self.assertEqual(i.partial, b'Hello\r\n')
self.assertEqual(repr(i),
"IncompleteRead(7 bytes read, 3 more expected)")
self.assertEqual(str(i),
@ -305,7 +305,7 @@ class BasicTest(TestCase):
class OfflineTest(TestCase):
def test_responses(self):
self.assertEquals(client.responses[client.NOT_FOUND], "Not Found")
self.assertEqual(client.responses[client.NOT_FOUND], "Not Found")
class TimeoutTest(TestCase):
PORT = None