From 1ca8c19b65637d292e3d10408ee6243447ec550a Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 25 Apr 2010 21:15:50 +0000 Subject: Replace a Lock with a better suited Event. --- Lib/test/test_httpservers.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index 287ad53..e392aee 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -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) -- cgit v0.12