Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2011-05-20 11:43:41 -05:00
parent 7f071e6e9f 2177ac9c41
commit a5a16bf532
1 changed files with 3 additions and 6 deletions
Show Stats 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()
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,