aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/python_utils
diff options
context:
space:
mode:
authorGravatar Eric Gribkoff <ericgribkoff@google.com>2017-03-16 13:44:09 -0700
committerGravatar Eric Gribkoff <ericgribkoff@google.com>2017-03-17 00:46:01 -0700
commit2f59cf2dc361e274bf97550447d5a72c8f239704 (patch)
tree0d8d955f0d4a1c0e2cef6b881ac3aa648ea4c2d3 /tools/run_tests/python_utils
parent246c0eee336fd657f82c9f4503295164efbdf9a6 (diff)
move health check to just before running test cases
Diffstat (limited to 'tools/run_tests/python_utils')
-rwxr-xr-xtools/run_tests/python_utils/dockerjob.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/run_tests/python_utils/dockerjob.py b/tools/run_tests/python_utils/dockerjob.py
index a29555428b..709fc121a9 100755
--- a/tools/run_tests/python_utils/dockerjob.py
+++ b/tools/run_tests/python_utils/dockerjob.py
@@ -76,15 +76,13 @@ def wait_for_healthy(cid, shortname, timeout_seconds):
while time.time() - started < timeout_seconds:
try:
output = subprocess.check_output(
- ['docker', 'inspect', '--format="{{.State.Health.Status}}"', cid])
- #stderr=_DEVNULL)
- print(output)
+ ['docker', 'inspect', '--format="{{.State.Health.Status}}"', cid],
+ stderr=_DEVNULL)
if output.strip('\n') == 'healthy':
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))