From: Brett Cannon <brett@python.org>
Date: Fri, 5 Aug 2011 05:43:11 +0000 (-0700)
Subject: Silence the altered state warning about threadgs when running test_httplib.
X-Git-Tag: v3.3.0a1~1748
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=252365bab8814b80a747a1a23e32414c1713c35e;p=thirdparty%2FPython%2Fcpython.git

Silence the altered state warning about threadgs when running test_httplib.
---

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index ce9e34638acb..066a6b7e92e9 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -506,8 +506,7 @@ class HTTPSTest(TestCase):
     def test_local_good_hostname(self):
         # The (valid) cert validates the HTTP hostname
         import ssl
-        from test.ssl_servers import make_https_server
-        server = make_https_server(self, CERT_localhost)
+        server = self.make_server(CERT_localhost)
         context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
         context.verify_mode = ssl.CERT_REQUIRED
         context.load_verify_locations(CERT_localhost)
@@ -515,12 +514,12 @@ class HTTPSTest(TestCase):
         h.request('GET', '/nonexistent')
         resp = h.getresponse()
         self.assertEqual(resp.status, 404)
+        del server
 
     def test_local_bad_hostname(self):
         # The (valid) cert doesn't validate the HTTP hostname
         import ssl
-        from test.ssl_servers import make_https_server
-        server = make_https_server(self, CERT_fakehostname)
+        server = self.make_server(CERT_fakehostname)
         context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
         context.verify_mode = ssl.CERT_REQUIRED
         context.load_verify_locations(CERT_fakehostname)
@@ -538,6 +537,7 @@ class HTTPSTest(TestCase):
         h.request('GET', '/nonexistent')
         resp = h.getresponse()
         self.assertEqual(resp.status, 404)
+        del server
 
 
 class RequestBodyTest(TestCase):