mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2011-05-20 11:43:41 -05:00
commit a5a16bf532
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/packaging/tests/pypi_server.py
View file

@ -78,12 +78,7 @@ class PyPIServerTestCase(unittest.TestCase):
super(PyPIServerTestCase, self).setUp() super(PyPIServerTestCase, self).setUp()
self.pypi = PyPIServer() self.pypi = PyPIServer()
self.pypi.start() 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): class PyPIServer(threading.Thread):
@ -154,6 +149,8 @@ class PyPIServer(threading.Thread):
def stop(self): def stop(self):
"""self shutdown is not supported for python < 2.6""" """self shutdown is not supported for python < 2.6"""
self._run = False self._run = False
self.join()
self.server.server_close()
def get_next_response(self): def get_next_response(self):
return (self.default_response_status, return (self.default_response_status,