From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 20 May 2011 11:13:58 +0000 (+0300)
Subject: Fix several ResourceWarnings in test_packaging.
X-Git-Tag: v3.3.0a1~2223
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86c54f0955690b560aa1f4bf23074d7256b5c447;p=python

Fix several ResourceWarnings in test_packaging.
---

diff --git a/Lib/packaging/tests/pypi_server.py b/Lib/packaging/tests/pypi_server.py
index cc5fcca05e..1e4b0120d9 100644
--- a/Lib/packaging/tests/pypi_server.py
+++ b/Lib/packaging/tests/pypi_server.py
@@ -78,7 +78,12 @@ class PyPIServerTestCase(unittest.TestCase):
         super(PyPIServerTestCase, self).setUp()
         self.pypi = PyPIServer()
         self.pypi.start()
-        self.addCleanup(self.pypi.stop)
+
+    def tearDown(self):
+        super(PyPIServerTestCase, self).tearDown()
+        self.pypi.stop()
+        self.pypi.join()
+        self.pypi.server.server_close()
 
 
 class PyPIServer(threading.Thread):