Skip to content

Commit 230784d

Browse files
fix(test_httplib.py): Fix logging in tests
1 parent d45864b commit 230784d

2 files changed

Lines changed: 21 additions & 7 deletions

File tree

Lib/http/client.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ def begin(self):
320320

321321
self.headers = self.msg = parse_headers(self.fp)
322322

323-
if _log.isEnabledFor(logging.DEBUG):
323+
if _log.isEnabledFor(logging.INFO):
324324
for hdr in self.headers:
325-
_log.debug("Received header: ('%s': '%s')", hdr, self.headers[hdr])
325+
_log.info("Received header: ('%s': '%s')", hdr, self.headers[hdr])
326326

327327
# are we using the chunked-style of transfer encoding?
328328
tr_enc = self.headers.get("transfer-encoding")
@@ -1065,7 +1065,7 @@ def _send_output(self, message_body=None, encode_chunked=False):
10651065
for chunk in chunks:
10661066
if not chunk:
10671067
if self.debuglevel > 0:
1068-
print('Zero length chunk ignored')
1068+
_log.info('Zero length chunk ignored')
10691069
continue
10701070

10711071
if encode_chunked and self._http_vsn == 11:
@@ -1334,7 +1334,11 @@ def getresponse(self):
13341334
if self.__state != _CS_REQ_SENT or self.__response:
13351335
raise ResponseNotReady(self.__state)
13361336

1337-
response = self.response_class(self.sock, method=self._method)
1337+
if self.debuglevel > 0:
1338+
response = self.response_class(
1339+
self.sock, self.debuglevel, method=self._method)
1340+
else:
1341+
response = self.response_class(self.sock, method=self._method)
13381342

13391343
try:
13401344
try:

Lib/test/test_httplib.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import io
44
import itertools
55
import os
6+
import sys
7+
import logging
68
import array
79
import socket
810
import threading
@@ -352,12 +354,16 @@ def test_headers_debuglevel(self):
352354
)
353355
sock = FakeSocket(body)
354356
resp = client.HTTPResponse(sock, debuglevel=1)
357+
logging.basicConfig(level=logging.INFO)
355358
with support.captured_stdout() as output:
359+
output_handler = logging.StreamHandler(output)
360+
_logger = logging.getLogger('http.client')
361+
_logger.addHandler(output_handler)
356362
resp.begin()
357363
lines = output.getvalue().splitlines()
358-
self.assertEqual(lines[0], "reply: 'HTTP/1.1 200 OK\\r\\n'")
359-
self.assertEqual(lines[1], "header: First: val")
360-
self.assertEqual(lines[2], "header: Second: val")
364+
self.assertEqual(lines[0], "Received response: 200 OK")
365+
self.assertEqual(lines[1], "Received header: ('First': 'val')")
366+
self.assertEqual(lines[2], "Received header: ('Second': 'val')")
361367

362368

363369
class TransferEncodingTest(TestCase):
@@ -1928,7 +1934,11 @@ def test_tunnel_debuglog(self):
19281934
self.conn._create_connection = self._create_connection(response_text)
19291935
self.conn.set_tunnel('destination.com')
19301936

1937+
logging.basicConfig(level=logging.INFO)
19311938
with support.captured_stdout() as output:
1939+
output_handler = logging.StreamHandler(output)
1940+
_logger = logging.getLogger('http.client')
1941+
_logger.addHandler(output_handler)
19321942
self.conn.request('PUT', '/', '')
19331943
lines = output.getvalue().splitlines()
19341944
self.assertIn('header: {}'.format(expected_header), lines)

0 commit comments

Comments
 (0)