mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 07:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Replace a Lock with a better suited Event.

Browse source
This commit is contained in:
Antoine Pitrou 2010-04-25 21:15:50 +00:00
parent 5c322ece96
commit 1ca8c19b65
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_httpservers.py
View file

@ -33,14 +33,14 @@ class TestServerThread(threading.Thread):
threading.Thread.__init__(self)
self.request_handler = request_handler
self.test_object = test_object
self.test_object.lock.acquire()
def run(self):
self.server = HTTPServer(('', 0), self.request_handler)
self.test_object.PORT = self.server.socket.getsockname()[1]
self.test_object.lock.release()
self.test_object.server_started.set()
self.test_object = None
try:
self.server.serve_forever()
self.server.serve_forever(0.05)
finally:
self.server.server_close()
@ -52,13 +52,12 @@ class BaseTestCase(unittest.TestCase):
def setUp(self):
self._threads = test_support.threading_setup()
os.environ = test_support.EnvironmentVarGuard()
self.lock = threading.Lock()
self.server_started = threading.Event()
self.thread = TestServerThread(self, self.request_handler)
self.thread.start()
self.lock.acquire()
self.server_started.wait()
def tearDown(self):
self.lock.release()
self.thread.stop()
os.environ.__exit__()
test_support.threading_cleanup(*self._threads)