Commit b63c5607 authored by Martin Panter's avatar Martin Panter

Close HTTP connections and responses in tests to avoid ResourceWarnings

parent 20843506
...@@ -1402,6 +1402,7 @@ class HTTPSTest(TestCase): ...@@ -1402,6 +1402,7 @@ class HTTPSTest(TestCase):
resp = h.getresponse() resp = h.getresponse()
h.close() h.close()
self.assertIn('nginx', resp.getheader('server')) self.assertIn('nginx', resp.getheader('server'))
resp.close()
@support.system_must_validate_cert @support.system_must_validate_cert
def test_networked_trusted_by_default_cert(self): def test_networked_trusted_by_default_cert(self):
...@@ -1412,6 +1413,7 @@ class HTTPSTest(TestCase): ...@@ -1412,6 +1413,7 @@ class HTTPSTest(TestCase):
h.request('GET', '/') h.request('GET', '/')
resp = h.getresponse() resp = h.getresponse()
content_type = resp.getheader('content-type') content_type = resp.getheader('content-type')
resp.close()
h.close() h.close()
self.assertIn('text/html', content_type) self.assertIn('text/html', content_type)
...@@ -1427,6 +1429,7 @@ class HTTPSTest(TestCase): ...@@ -1427,6 +1429,7 @@ class HTTPSTest(TestCase):
h.request('GET', '/') h.request('GET', '/')
resp = h.getresponse() resp = h.getresponse()
server_string = resp.getheader('server') server_string = resp.getheader('server')
resp.close()
h.close() h.close()
self.assertIn('nginx', server_string) self.assertIn('nginx', server_string)
...@@ -1460,8 +1463,10 @@ class HTTPSTest(TestCase): ...@@ -1460,8 +1463,10 @@ class HTTPSTest(TestCase):
context.verify_mode = ssl.CERT_REQUIRED context.verify_mode = ssl.CERT_REQUIRED
context.load_verify_locations(CERT_localhost) context.load_verify_locations(CERT_localhost)
h = client.HTTPSConnection('localhost', server.port, context=context) h = client.HTTPSConnection('localhost', server.port, context=context)
self.addCleanup(h.close)
h.request('GET', '/nonexistent') h.request('GET', '/nonexistent')
resp = h.getresponse() resp = h.getresponse()
self.addCleanup(resp.close)
self.assertEqual(resp.status, 404) self.assertEqual(resp.status, 404)
def test_local_bad_hostname(self): def test_local_bad_hostname(self):
...@@ -1486,13 +1491,18 @@ class HTTPSTest(TestCase): ...@@ -1486,13 +1491,18 @@ class HTTPSTest(TestCase):
check_hostname=False) check_hostname=False)
h.request('GET', '/nonexistent') h.request('GET', '/nonexistent')
resp = h.getresponse() resp = h.getresponse()
resp.close()
h.close()
self.assertEqual(resp.status, 404) self.assertEqual(resp.status, 404)
# The context's check_hostname setting is used if one isn't passed to # The context's check_hostname setting is used if one isn't passed to
# HTTPSConnection. # HTTPSConnection.
context.check_hostname = False context.check_hostname = False
h = client.HTTPSConnection('localhost', server.port, context=context) h = client.HTTPSConnection('localhost', server.port, context=context)
h.request('GET', '/nonexistent') h.request('GET', '/nonexistent')
self.assertEqual(h.getresponse().status, 404) resp = h.getresponse()
self.assertEqual(resp.status, 404)
resp.close()
h.close()
# Passing check_hostname to HTTPSConnection should override the # Passing check_hostname to HTTPSConnection should override the
# context's setting. # context's setting.
h = client.HTTPSConnection('localhost', server.port, context=context, h = client.HTTPSConnection('localhost', server.port, context=context,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment