diff options
Diffstat (limited to 'Lib/test/test_httpservers.py')
| -rw-r--r-- | Lib/test/test_httpservers.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index 4653f4c..aa1e48c 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -34,14 +34,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() @@ -51,13 +51,12 @@ class TestServerThread(threading.Thread): class BaseTestCase(unittest.TestCase): def setUp(self): - 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() def request(self, uri, method='GET', body=None, headers={}): |