delay health check, increase timeout

xaqq · Mar 17, 2017 · 246c0ee · 246c0ee
1 parent 6ce6166
commit 246c0ee
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
@@ -957,15 +957,16 @@ def aggregate_http2_results(stdout):
       # don't run the server, set server port to a placeholder value
       server_addresses[lang] = ('localhost', '${SERVER_PORT}')
 
+  http2_server_job = None
   if args.http2_badserver_interop:
     # launch a HTTP2 server emulator that creates edge cases
     lang = str(http2InteropServer)
     spec = server_jobspec(http2InteropServer, docker_images.get(lang),
                           manual_cmd_log=server_manual_cmd_log)
     if not args.manual_run:
       job = dockerjob.DockerJob(spec)
-      job.wait_for_healthy(timeout_seconds=240)
-      print(subprocess.check_output(['docker', 'version']))
+      #job.wait_for_healthy(timeout_seconds=240)
+      http2_server_job = job
       server_jobs[lang] = job
       http2_badserver_ports = tuple([
           job.mapped_port(_DEFAULT_SERVER_PORT + i)
@@ -1055,6 +1056,8 @@ def aggregate_http2_results(stdout):
         jobs.append(test_job)
 
   if args.http2_badserver_interop:
+    print(subprocess.check_output(['docker', 'ps']))
+    http2_server_job.wait_for_healthy(timeout_seconds=600)
     for language in languages_http2_badserver_interop:
       for test_case in _HTTP2_BADSERVER_TEST_CASES:
         offset = sorted(_HTTP2_BADSERVER_TEST_CASES).index(test_case)