summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-20 11:13:58 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-20 11:13:58 (GMT)
commit86c54f0955690b560aa1f4bf23074d7256b5c447 (patch)
tree4222e1df177aa1e85cf531c8e1b8d760724fa73a
parentba8ef7a81d5a2ee09713a273c156abf839c7b21b (diff)
downloadcpython-86c54f0955690b560aa1f4bf23074d7256b5c447.zip
cpython-86c54f0955690b560aa1f4bf23074d7256b5c447.tar.gz
cpython-86c54f0955690b560aa1f4bf23074d7256b5c447.tar.bz2
Fix several ResourceWarnings in test_packaging.
-rw-r--r--Lib/packaging/tests/pypi_server.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/packaging/tests/pypi_server.py b/Lib/packaging/tests/pypi_server.py
index cc5fcca..1e4b012 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):