From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 27 Oct 2009 18:52:30 +0000 (+0000)
Subject: Merged revisions 75838 via svnmerge from
X-Git-Tag: v3.2a1~2305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45ebeb8f24710cbc50c77806893df1a2e7593762;p=python

Merged revisions 75838 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75838 | antoine.pitrou | 2009-10-27 19:50:52 +0100 (mar., 27 oct. 2009) | 3 lines

  (Hopefully) suppress transient refleaks in test_httpservers.
........
---

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 9a3d204959..93a6dedb1c 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -51,6 +51,7 @@ class TestServerThread(threading.Thread):
 
 class BaseTestCase(unittest.TestCase):
     def setUp(self):
+        self._threads = support.threading_setup()
         os.environ = support.EnvironmentVarGuard()
         self.lock = threading.Lock()
         self.thread = TestServerThread(self, self.request_handler)
@@ -61,6 +62,7 @@ class BaseTestCase(unittest.TestCase):
         self.lock.release()
         self.thread.stop()
         os.environ.__exit__()
+        support.threading_cleanup(*self._threads)
 
     def request(self, uri, method='GET', body=None, headers={}):
         self.connection = http.client.HTTPConnection('localhost', self.PORT)