diff options
| author | Stevan Radakovic <stevan.radakovic@linaro.org> | 2017-12-21 14:28:50 +0100 |
|---|---|---|
| committer | Remi Duraffort <remi.duraffort@linaro.org> | 2018-01-08 14:39:59 +0000 |
| commit | f3314e91e18ead862c09cb9202e199e64d20a63e (patch) | |
| tree | 0331591ecec34e6e470f779285e0a7951e03b0d7 | |
| parent | 9fbfb17325f94abfa246bfc4be8bd0f99688c718 (diff) | |
Support the update of the TestJob status field name change.
Field 'status' was renamed to 'state'. Support the change in
wait-job-events command.
Change-Id: I59a911dd47ca5f9aec999636005f279468348896
Reviewed-on: https://review.linaro.org/23122
Reviewed-by: lava-bot
Reviewed-by: Remi Duraffort <remi.duraffort@linaro.org>
| -rw-r--r-- | lava_scheduler_tool/commands.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lava_scheduler_tool/commands.py b/lava_scheduler_tool/commands.py index 4b07af8..915021e 100644 --- a/lava_scheduler_tool/commands.py +++ b/lava_scheduler_tool/commands.py @@ -696,7 +696,7 @@ class wait_job_events(Command): # pylint: disable=invalid-name Wait for job to finish and return job details. """ - FINISHED_JOB_STATUS = ["Complete", "Incomplete", "Canceled"] + FINISHED_JOB_STATE = "Finished" EVENT_SOCKET_PATTERN_SYMBOL = "*" def reparse_arguments(self, parser, raw_args): @@ -747,9 +747,9 @@ class wait_job_events(Command): # pylint: disable=invalid-name try: job = server.scheduler.job_details(self.args.job_id) - if job["status"] in self.FINISHED_JOB_STATUS: - print("Job %s already finished with status %s." % ( - self.args.job_id, job["status"])) + if job["state"] == self.FINISHED_JOB_STATE: + print("Job %s already finished with state %s." % ( + self.args.job_id, job["health"])) return except xmlrpclib.Fault: @@ -801,7 +801,7 @@ class wait_job_events(Command): # pylint: disable=invalid-name sock.setsockopt(zmq.SUBSCRIBE, b"") # pylint: disable=no-member sock.connect(event_socket) - print("Now waiting for job events...\n") + print("Now waiting for job events...") while True: msg = sock.recv_multipart() try: @@ -817,11 +817,11 @@ class wait_job_events(Command): # pylint: disable=invalid-name if data["job"] in job_ids: data["job"] = urlparse.urljoin( job_url_template, str(data["job"])) - if data["status"] in self.FINISHED_JOB_STATUS: - print(data, "\n") + if data["state"] == self.FINISHED_JOB_STATE: + print(data) break elif not self.args.quiet: - print(data, "\n") + print(data) except zmq.error.ZMQError as exc: sys.stderr.write("wait_job_events() error: %s\n" % exc) @@ -834,8 +834,8 @@ class wait_job_events(Command): # pylint: disable=invalid-name try: for job_id in job_ids: ret_details = server.scheduler.job_details(job_id) - print("Job %s currently has status %s." % ( - job_id, ret_details["status"])) + print("Job %s currently has state %s." % ( + job_id, ret_details["state"])) print("You can check the job details with 'lava-tool job-details' command.") return 1 except xmlrpclib.Fault: |