Mercurial > cpython-lru_cache-weakref
diff Lib/test/test_httpservers.py @ 60970:6548c23676a6
Merged revisions 80480 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80480 | antoine.pitrou | 2010-04-25 23:15:50 +0200 (dim., 25 avril 2010) | 3 lines
Replace a Lock with a better suited Event.
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Sun, 25 Apr 2010 22:19:43 +0000 |
| parents | 40f787b151ac |
| children | 493bb4585e38 |
line wrap: on
line diff
--- a/Lib/test/test_httpservers.py Sun Apr 25 22:01:43 2010 +0000 +++ b/Lib/test/test_httpservers.py Sun Apr 25 22:19:43 2010 +0000 @@ -34,14 +34,14 @@ 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() @@ -53,13 +53,12 @@ def setUp(self): self._threads = support.threading_setup() os.environ = 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__() support.threading_cleanup(*self._threads)