Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #20555: Use specific asserts in urllib, httplib, ftplib, cgi, wsgiref tests.

This commit is contained in:
Serhiy Storchaka 2014-02-08 14:50:08 +02:00
parent 3a20a5dead
commit 25d8aeac7c
8 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_cgi.py
View File

@ -227,7 +227,7 @@ class CgiTests(unittest.TestCase):
# if we're not chunking properly, readline is only called twice # if we're not chunking properly, readline is only called twice
# (by read_binary); if we are chunking properly, it will be called 5 times # (by read_binary); if we are chunking properly, it will be called 5 times
# as long as the chunksize is 1 << 16. # as long as the chunksize is 1 << 16.
self.assertTrue(f.numcalls > 2) self.assertGreater(f.numcalls, 2)
f.close() f.close()
def test_fieldstorage_multipart(self): def test_fieldstorage_multipart(self):

6
Lib/test/test_ftplib.py
View File

@ -965,7 +965,7 @@ class TestTimeouts(TestCase):
def testTimeoutDefault(self): def testTimeoutDefault(self):
# default -- use global socket timeout # default -- use global socket timeout
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
ftp = ftplib.FTP(HOST) ftp = ftplib.FTP(HOST)
@ -977,13 +977,13 @@ class TestTimeouts(TestCase):
def testTimeoutNone(self): def testTimeoutNone(self):
# no timeout -- do not use global socket timeout # no timeout -- do not use global socket timeout
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
ftp = ftplib.FTP(HOST, timeout=None) ftp = ftplib.FTP(HOST, timeout=None)
finally: finally:
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
self.assertTrue(ftp.sock.gettimeout() is None) self.assertIsNone(ftp.sock.gettimeout())
self.evt.wait() self.evt.wait()
ftp.close() ftp.close()

6
Lib/test/test_httplib.py
View File

@ -132,7 +132,7 @@ class HeaderTests(TestCase):
conn.sock = FakeSocket(None) conn.sock = FakeSocket(None)
conn.putrequest('GET','/') conn.putrequest('GET','/')
conn.putheader('Content-length', 42) conn.putheader('Content-length', 42)
self.assertTrue(b'Content-length: 42' in conn._buffer) self.assertIn(b'Content-length: 42', conn._buffer)
def test_ipv6host_header(self): def test_ipv6host_header(self):
# Default host header on IPv6 transaction should wrapped by [] if # Default host header on IPv6 transaction should wrapped by [] if
@ -699,7 +699,7 @@ class TimeoutTest(TestCase):
# and into the socket. # and into the socket.
# default -- use global socket timeout # default -- use global socket timeout
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT) httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT)
@ -710,7 +710,7 @@ class TimeoutTest(TestCase):
httpConn.close() httpConn.close()
# no timeout -- do not use global socket default # no timeout -- do not use global socket default
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT, httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT,

2
Lib/test/test_httpservers.py
View File

@ -531,7 +531,7 @@ class BaseHTTPRequestHandlerTestCase(unittest.TestCase):
def verify_http_server_response(self, response): def verify_http_server_response(self, response):
match = self.HTTPResponseMatch.search(response) match = self.HTTPResponseMatch.search(response)
self.assertTrue(match is not None) self.assertIsNotNone(match)
def test_http_1_1(self): def test_http_1_1(self):
result = self.send_typical_request(b'GET / HTTP/1.1\r\n\r\n') result = self.send_typical_request(b'GET / HTTP/1.1\r\n\r\n')

4
Lib/test/test_urllib.py
View File

@ -1264,7 +1264,7 @@ class URLopener_Tests(unittest.TestCase):
# def testTimeoutNone(self): # def testTimeoutNone(self):
# # global default timeout is ignored # # global default timeout is ignored
# import socket # import socket
# self.assertTrue(socket.getdefaulttimeout() is None) # self.assertIsNone(socket.getdefaulttimeout())
# socket.setdefaulttimeout(30) # socket.setdefaulttimeout(30)
# try: # try:
# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) # ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, [])
@ -1276,7 +1276,7 @@ class URLopener_Tests(unittest.TestCase):
# def testTimeoutDefault(self): # def testTimeoutDefault(self):
# # global default timeout is used # # global default timeout is used
# import socket # import socket
# self.assertTrue(socket.getdefaulttimeout() is None) # self.assertIsNone(socket.getdefaulttimeout())
# socket.setdefaulttimeout(30) # socket.setdefaulttimeout(30)
# try: # try:
# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) # ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, [])

7
Lib/test/test_urllib2.py
View File

@ -594,8 +594,8 @@ class OpenerDirectorTests(unittest.TestCase):
self.assertIsInstance(args[0], Request) self.assertIsInstance(args[0], Request)
# response from opener.open is None, because there's no # response from opener.open is None, because there's no
# handler that defines http_open to handle it # handler that defines http_open to handle it
self.assertTrue(args[1] is None or if args[1] is not None:
isinstance(args[1], MockResponse)) self.assertIsInstance(args[1], MockResponse)
def test_method_deprecations(self): def test_method_deprecations(self):
req = Request("http://www.example.com") req = Request("http://www.example.com")
@ -1000,7 +1000,8 @@ class HandlerTests(unittest.TestCase):
MockHeaders({"location": to_url})) MockHeaders({"location": to_url}))
except urllib.error.HTTPError: except urllib.error.HTTPError:
# 307 in response to POST requires user OK # 307 in response to POST requires user OK
self.assertTrue(code == 307 and data is not None) self.assertEqual(code, 307)
self.assertIsNotNone(data)
self.assertEqual(o.req.get_full_url(), to_url) self.assertEqual(o.req.get_full_url(), to_url)
try: try:
self.assertEqual(o.req.get_method(), "GET") self.assertEqual(o.req.get_method(), "GET")

22
Lib/test/test_urllib2net.py
View File

@ -85,7 +85,7 @@ class CloseSocketTest(unittest.TestCase):
with support.transient_internet(url): with support.transient_internet(url):
response = _urlopen_with_retry(url) response = _urlopen_with_retry(url)
sock = response.fp sock = response.fp
self.assertTrue(not sock.closed) self.assertFalse(sock.closed)
response.close() response.close()
self.assertTrue(sock.closed) self.assertTrue(sock.closed)
@ -252,15 +252,15 @@ class OtherNetworkTests(unittest.TestCase):
class TimeoutTest(unittest.TestCase): class TimeoutTest(unittest.TestCase):
def test_http_basic(self): def test_http_basic(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
url = "http://www.python.org" url = "http://www.python.org"
with support.transient_internet(url, timeout=None): with support.transient_internet(url, timeout=None):
u = _urlopen_with_retry(url) u = _urlopen_with_retry(url)
self.addCleanup(u.close) self.addCleanup(u.close)
self.assertTrue(u.fp.raw._sock.gettimeout() is None) self.assertIsNone(u.fp.raw._sock.gettimeout())
def test_http_default_timeout(self): def test_http_default_timeout(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
url = "http://www.python.org" url = "http://www.python.org"
with support.transient_internet(url): with support.transient_internet(url):
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
@ -272,7 +272,7 @@ class TimeoutTest(unittest.TestCase):
self.assertEqual(u.fp.raw._sock.gettimeout(), 60) self.assertEqual(u.fp.raw._sock.gettimeout(), 60)
def test_http_no_timeout(self): def test_http_no_timeout(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
url = "http://www.python.org" url = "http://www.python.org"
with support.transient_internet(url): with support.transient_internet(url):
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
@ -281,7 +281,7 @@ class TimeoutTest(unittest.TestCase):
self.addCleanup(u.close) self.addCleanup(u.close)
finally: finally:
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
self.assertTrue(u.fp.raw._sock.gettimeout() is None) self.assertIsNone(u.fp.raw._sock.gettimeout())
def test_http_timeout(self): def test_http_timeout(self):
url = "http://www.python.org" url = "http://www.python.org"
@ -293,14 +293,14 @@ class TimeoutTest(unittest.TestCase):
FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/" FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/"
def test_ftp_basic(self): def test_ftp_basic(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
with support.transient_internet(self.FTP_HOST, timeout=None): with support.transient_internet(self.FTP_HOST, timeout=None):
u = _urlopen_with_retry(self.FTP_HOST) u = _urlopen_with_retry(self.FTP_HOST)
self.addCleanup(u.close) self.addCleanup(u.close)
self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None) self.assertIsNone(u.fp.fp.raw._sock.gettimeout())
def test_ftp_default_timeout(self): def test_ftp_default_timeout(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
with support.transient_internet(self.FTP_HOST): with support.transient_internet(self.FTP_HOST):
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
try: try:
@ -311,7 +311,7 @@ class TimeoutTest(unittest.TestCase):
self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60) self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60)
def test_ftp_no_timeout(self): def test_ftp_no_timeout(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
with support.transient_internet(self.FTP_HOST): with support.transient_internet(self.FTP_HOST):
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
try: try:
@ -319,7 +319,7 @@ class TimeoutTest(unittest.TestCase):
self.addCleanup(u.close) self.addCleanup(u.close)
finally: finally:
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None) self.assertIsNone(u.fp.fp.raw._sock.gettimeout())
def test_ftp_timeout(self): def test_ftp_timeout(self):
with support.transient_internet(self.FTP_HOST): with support.transient_internet(self.FTP_HOST):

4
Lib/test/test_wsgiref.py
View File

@ -196,7 +196,7 @@ class UtilityTests(TestCase):
# Check existing value # Check existing value
env = {key:alt} env = {key:alt}
util.setup_testing_defaults(env) util.setup_testing_defaults(env)
self.assertTrue(env[key] is alt) self.assertIs(env[key], alt)
def checkCrossDefault(self,key,value,**kw): def checkCrossDefault(self,key,value,**kw):
util.setup_testing_defaults(kw) util.setup_testing_defaults(kw)
@ -343,7 +343,7 @@ class HeaderTests(TestCase):
self.assertEqual(Headers(test[:]).keys(), ['x']) self.assertEqual(Headers(test[:]).keys(), ['x'])
self.assertEqual(Headers(test[:]).values(), ['y']) self.assertEqual(Headers(test[:]).values(), ['y'])
self.assertEqual(Headers(test[:]).items(), test) self.assertEqual(Headers(test[:]).items(), test)
self.assertFalse(Headers(test).items() is test) # must be copy! self.assertIsNot(Headers(test).items(), test) # must be copy!
h=Headers([]) h=Headers([])
del h['foo'] # should not raise an error del h['foo'] # should not raise an error