From 49e04fb240ce700a6871d6b490536a879afd99f5 Mon Sep 17 00:00:00 2001 From: Andy Hayden Date: Tue, 29 Oct 2019 13:06:14 -0700 Subject: fix race condition in test http server (#3237) --- tools/http_server.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tools/http_server.py') diff --git a/tools/http_server.py b/tools/http_server.py index 0a8212b82..76efab73b 100755 --- a/tools/http_server.py +++ b/tools/http_server.py @@ -178,20 +178,20 @@ def spawn(): while any(not s.thread.is_alive() for s in servers): sleep(0.01) try: - yield + print "ready" + yield servers finally: for s in servers: s.server.shutdown() def main(): - servers = (server(), redirect_server(), another_redirect_server(), - double_redirects_server(), inf_redirects_server()) - try: - while all(s.thread.is_alive() for s in servers): - sleep(10) - except KeyboardInterrupt: - pass + with spawn() as servers: + try: + while all(s.thread.is_alive() for s in servers): + sleep(1) + except KeyboardInterrupt: + pass sys.exit(1) -- cgit v1.2.3