aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar Eric Gribkoff <ericgribkoff@google.com>2017-03-16 07:53:50 -0700
committerGravatar Eric Gribkoff <ericgribkoff@google.com>2017-03-17 00:46:01 -0700
commit92a5d28a4c0afc4cfd1f7eaba5d876a53a314986 (patch)
tree7e68ddb23fb6dee2fa51a34c99ea26e7ec123753 /tools/run_tests
parentd86a19efd0bb011fbadc304434c2512c4607f8b4 (diff)
increase wait for healthy timeout
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-xtools/run_tests/python_utils/dockerjob.py4
-rwxr-xr-xtools/run_tests/run_interop_tests.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/run_tests/python_utils/dockerjob.py b/tools/run_tests/python_utils/dockerjob.py
index cdf5759f8c..a29555428b 100755
--- a/tools/run_tests/python_utils/dockerjob.py
+++ b/tools/run_tests/python_utils/dockerjob.py
@@ -83,6 +83,8 @@ def wait_for_healthy(cid, shortname, timeout_seconds):
return
except subprocess.CalledProcessError as e:
pass
+ time.sleep(1)
+ print(subprocess.check_output(['docker', 'ps']))
raise Exception('Timed out waiting for %s (%s) to pass health check' %
(shortname, cid))
@@ -130,7 +132,7 @@ class DockerJob:
def mapped_port(self, port):
return docker_mapped_port(self._container_name, port)
- def wait_for_healthy(self, timeout_seconds=15):
+ def wait_for_healthy(self, timeout_seconds):
wait_for_healthy(self._container_name, self._spec.shortname, timeout_seconds)
def kill(self, suppress_failure=False):
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 48f297804c..b5977bf4f3 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -964,7 +964,7 @@ try:
manual_cmd_log=server_manual_cmd_log)
if not args.manual_run:
job = dockerjob.DockerJob(spec)
- job.wait_for_healthy(timeout_seconds=15)
+ job.wait_for_healthy(timeout_seconds=240)
server_jobs[lang] = job
http2_badserver_ports = tuple([
job.mapped_port(_DEFAULT_SERVER_PORT + i)