From 5c9d7142d58aacd66c33929b10b643e663a9e3cd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Aug 10 2015 18:10:57 +0000
Subject: report_job_results: handle cancelled jobs


Summary:
Cancelled jobs have their own state (at least in the openQA
running on happyassassin, they do). This causes r_j_r to get
stuck forever if any of the jobs are cancelled. Consider a
cancelled job 'done'.

Test Plan:
Try submitting results for a set of jobs that includes one or
more cancelled jobs. It should now work (before it would get
stuck).

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D492

---

diff --git a/openqa_trigger/report_job_results.py b/openqa_trigger/report_job_results.py
index bffa76c..b1b2704 100644
--- a/openqa_trigger/report_job_results.py
+++ b/openqa_trigger/report_job_results.py
@@ -25,7 +25,7 @@ def get_passed_testcases(job_ids, client):
         for job_id, url in running_jobs.items():
             output = client.openqa_request('GET', url)
             job_state = output['job']
-            if job_state['state'] == 'done':
+            if job_state['state'] in ('done', 'cancelled'):
                 logger.info("job %s is done", job_id)
                 finished_jobs[job_id] = job_state
                 del running_jobs[job_id]