diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-05-20 16:43:41 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-05-20 16:43:41 (GMT) |
| commit | a5a16bf532486d3279230623e9160435d011de3b (patch) | |
| tree | 399e99083df76c3bcd8621d02f77c6513cbf0f08 /Lib/packaging/tests/pypi_server.py | |
| parent | 7f071e6e9f463c459d3a9f55dba35993947d574c (diff) | |
| parent | 2177ac9c41ff97fde0f398b878b5d84528f0c9f1 (diff) | |
| download | cpython-a5a16bf532486d3279230623e9160435d011de3b.zip cpython-a5a16bf532486d3279230623e9160435d011de3b.tar.gz cpython-a5a16bf532486d3279230623e9160435d011de3b.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/packaging/tests/pypi_server.py')
| -rw-r--r-- | Lib/packaging/tests/pypi_server.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Lib/packaging/tests/pypi_server.py b/Lib/packaging/tests/pypi_server.py index 1e4b012..d22f5c3 100644 --- a/Lib/packaging/tests/pypi_server.py +++ b/Lib/packaging/tests/pypi_server.py @@ -78,12 +78,7 @@ class PyPIServerTestCase(unittest.TestCase): super(PyPIServerTestCase, self).setUp() self.pypi = PyPIServer() self.pypi.start() - - def tearDown(self): - super(PyPIServerTestCase, self).tearDown() - self.pypi.stop() - self.pypi.join() - self.pypi.server.server_close() + self.addCleanup(self.pypi.stop) class PyPIServer(threading.Thread): @@ -154,6 +149,8 @@ class PyPIServer(threading.Thread): def stop(self): """self shutdown is not supported for python < 2.6""" self._run = False + self.join() + self.server.server_close() def get_next_response(self): return (self.default_response_status, |