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

bpo-36918: Fix "Exception ignored in" in test_urllib (GH-13996)

Browse source 
Mock the HTTPConnection.close() method in a few unit tests to avoid
logging "Exception ignored in: ..." messages.
(cherry picked from commit eb976e47e2)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
This commit is contained in:
Miss Islington (bot) 2019-06-11 19:26:02 -07:00 • committed by GitHub
parent 3ba21070c6
commit 9d37ae0bee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/test/test_urllib.py
View file

@ -56,7 +56,7 @@ def FancyURLopener():
return urllib.request.FancyURLopener() return urllib.request.FancyURLopener()
def fakehttp(fakedata): def fakehttp(fakedata, mock_close=False):
class FakeSocket(io.BytesIO): class FakeSocket(io.BytesIO):
io_refs = 1 io_refs = 1
@ -90,15 +90,24 @@ def fakehttp(fakedata):
def connect(self): def connect(self):
self.sock = FakeSocket(self.fakedata) self.sock = FakeSocket(self.fakedata)
type(self).fakesock = self.sock type(self).fakesock = self.sock
if mock_close:
# bpo-36918: HTTPConnection destructor calls close() which calls
# flush(). Problem: flush() calls self.fp.flush() which raises
# "ValueError: I/O operation on closed file" which is logged as an
# "Exception ignored in". Override close() to silence this error.
def close(self):
pass
FakeHTTPConnection.fakedata = fakedata FakeHTTPConnection.fakedata = fakedata
return FakeHTTPConnection return FakeHTTPConnection
class FakeHTTPMixin(object): class FakeHTTPMixin(object):
def fakehttp(self, fakedata): def fakehttp(self, fakedata, mock_close=False):
fake_http_class = fakehttp(fakedata, mock_close=mock_close)
self._connection_class = http.client.HTTPConnection self._connection_class = http.client.HTTPConnection
http.client.HTTPConnection = fakehttp(fakedata) http.client.HTTPConnection = fake_http_class
def unfakehttp(self): def unfakehttp(self):
http.client.HTTPConnection = self._connection_class http.client.HTTPConnection = self._connection_class
@ -400,7 +409,7 @@ Date: Wed, 02 Jan 2008 03:03:54 GMT
Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
Connection: close Connection: close
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
''') ''', mock_close=True)
try: try:
self.assertRaises(OSError, urlopen, "http://python.org/") self.assertRaises(OSError, urlopen, "http://python.org/")
finally: finally:
@ -414,7 +423,7 @@ Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
Location: file://guidocomputer.athome.com:/python/license Location: file://guidocomputer.athome.com:/python/license
Connection: close Connection: close
Content-Type: text/html; charset=iso-8859-1 Content-Type: text/html; charset=iso-8859-1
''') ''', mock_close=True)
try: try:
msg = "Redirection to url 'file:" msg = "Redirection to url 'file:"
with self.assertRaisesRegex(urllib.error.HTTPError, msg): with self.assertRaisesRegex(urllib.error.HTTPError, msg):
@ -429,7 +438,7 @@ Content-Type: text/html; charset=iso-8859-1
self.fakehttp(b'''HTTP/1.1 302 Found self.fakehttp(b'''HTTP/1.1 302 Found
Location: file://guidocomputer.athome.com:/python/license Location: file://guidocomputer.athome.com:/python/license
Connection: close Connection: close
''') ''', mock_close=True)
try: try:
self.assertRaises(urllib.error.HTTPError, urlopen, self.assertRaises(urllib.error.HTTPError, urlopen,
"http://something") "http://something")