Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-03-21 12:16:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-31259: test_urllib2_localnet uses addCleanup(server.stop) (#3186)

Browse source 
Use self.addCleanup(self.server.stop) to stop the HTTP server. Some
tests didn't stop the server like test_https().

Fix also the usage of support.threading_cleanup().
This commit is contained in:
Victor Stinner 2017-08-22 18:03:38 +02:00 • committed by GitHub
parent 5f20539ee5
commit 468534d92f
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/test/test_urllib2_localnet.py
View file

@ -289,11 +289,15 @@ def setUp(self):
def http_server_with_basic_auth_handler(*args, **kwargs):
return BasicAuthHandler(*args, **kwargs)
self.server = LoopbackHttpServerThread(http_server_with_basic_auth_handler)
self.addCleanup(self.server.stop)
self.addCleanup(self.stop_server)
self.server_url = 'http://127.0.0.1:%s' % self.server.port
self.server.start()
self.server.ready.wait()
def stop_server(self):
self.server.stop()
self.server = None
def tearDown(self):
super(BasicAuthTests, self).tearDown()
@ -339,6 +343,7 @@ def create_fake_proxy_handler(*args, **kwargs):
return FakeProxyHandler(self.digest_auth_handler, *args, **kwargs)
self.server = LoopbackHttpServerThread(create_fake_proxy_handler)
self.addCleanup(self.stop_server)
self.server.start()
self.server.ready.wait()
proxy_url = "http://127.0.0.1:%d" % self.server.port
@ -347,9 +352,9 @@ def create_fake_proxy_handler(*args, **kwargs):
self.opener = urllib.request.build_opener(
handler, self.proxy_digest_handler)
def tearDown(self):
def stop_server(self):
self.server.stop()
super(ProxyAuthTests, self).tearDown()
self.server = None
def test_proxy_with_bad_password_raises_httperror(self):
self.proxy_digest_handler.add_password(self.REALM, self.URL,
@ -468,13 +473,17 @@ def urlopen(self, url, data=None, **kwargs):
f.close()
return b"".join(l)
def stop_server(self):
self.server.stop()
self.server = None
def start_server(self, responses=None):
if responses is None:
responses = [(200, [], b"we don't care")]
handler = GetRequestHandler(responses)
self.server = LoopbackHttpServerThread(handler)
self.addCleanup(self.server.stop)
self.addCleanup(self.stop_server)
self.server.start()
self.server.ready.wait()
port = self.server.port
@ -664,7 +673,7 @@ def setUpModule():
def tearDownModule():
if threads_key:
support.threading_cleanup(threads_key)
support.threading_cleanup(*threads_key)
if __name__ == "__main__":
unittest.main()