summaryrefslogtreecommitdiff
path: root/test/contrib
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2017-06-14 21:30:09 +0100
committerGitHub <noreply@github.com>2017-06-14 21:30:09 +0100
commit98f9b0c105b2bc5c0d00a8631db0a064918e8948 (patch)
tree912fb71bd66392d66b00d35043a396064e6643bd /test/contrib
parent39315237c009d6c18601449a48d5e096869f2a31 (diff)
parentd74df4af794b28db61edbbacec688463bbabdd43 (diff)
downloadurllib3-98f9b0c105b2bc5c0d00a8631db0a064918e8948.tar.gz
Merge branch 'master' into gae-to-pytestgae-to-pytest
Diffstat (limited to 'test/contrib')
-rw-r--r--test/contrib/test_socks.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/contrib/test_socks.py b/test/contrib/test_socks.py
index da553437..d5c82744 100644
--- a/test/contrib/test_socks.py
+++ b/test/contrib/test_socks.py
@@ -255,6 +255,7 @@ class TestSocks5Proxy(IPV4SocketDummyServerTestCase):
self._start_server(request_handler)
proxy_url = "socks5://%s:%s" % (self.host, self.port)
pm = socks.SOCKSProxyManager(proxy_url)
+ self.addCleanup(pm.clear)
response = pm.request('GET', 'http://localhost')
self.assertEqual(response.status, 200)
@@ -511,6 +512,7 @@ class TestSOCKS4Proxy(IPV4SocketDummyServerTestCase):
self._start_server(request_handler)
proxy_url = "socks4://%s:%s" % (self.host, self.port)
pm = socks.SOCKSProxyManager(proxy_url)
+ self.addCleanup(pm.clear)
response = pm.request('GET', 'http://localhost')
self.assertEqual(response.status, 200)
@@ -664,6 +666,7 @@ class TestSOCKSWithTLS(IPV4SocketDummyServerTestCase):
b'Content-Length: 0\r\n'
b'\r\n')
tls.close()
+ sock.close()
self._start_server(request_handler)
proxy_url = "socks5h://%s:%s" % (self.host, self.port)