diff options
| author |  Mark D. Roth <roth@google.com> | 2016-07-01 14:17:38 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-07-01 14:17:38 -0700 |
| commit | 3c945ee2b3c3bf0fd01cc995332e252d1e10e51e (patch) | |
| tree | 9bbd2d09cebc94133609932827b8fa7a71bb8365 /tools/run_tests/dockerjob.py | |
| parent | afa864244d921626480abc6e4408a2aa183396c3 (diff) | |
| parent | 20caeb182cbc152e7e038306a9b01f438f79ca41 (diff) | |
Merge branch 'master' into filter_call_init_failure
Diffstat (limited to 'tools/run_tests/dockerjob.py')
| -rwxr-xr-x | tools/run_tests/dockerjob.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/dockerjob.py b/tools/run_tests/dockerjob.py index 326c4faed9..e4ca3b7faa 100755 --- a/tools/run_tests/dockerjob.py +++ b/tools/run_tests/dockerjob.py @@ -104,7 +104,7 @@ class DockerJob: def __init__(self, spec): self._spec = spec - self._job = jobset.Job(spec, bin_hash=None, newline_on_success=True, travis=True, add_env={}) + self._job = jobset.Job(spec, newline_on_success=True, travis=True, add_env={}) self._container_name = spec.container_name def mapped_port(self, port): @@ -118,4 +118,4 @@ class DockerJob: def is_running(self): """Polls a job and returns True if given job is still running.""" - return self._job.state(jobset.NoCache()) == jobset._RUNNING + return self._job.state() == jobset._RUNNING |