aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xtools/run_tests/run_interop_tests.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index a516472759..579114939f 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -957,6 +957,7 @@ try:
# 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)
@@ -964,8 +965,8 @@ try:
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 @@ try:
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)