Merge pull request #1972 from VallariAg/fix-teuthology-kill

teuthology/kill.py: Fix "TypeError: 'NoneType' object is not iterable"

teuthology/kill.py

@@ -233,11 +233,11 @@ def find_pids(run_name):
 def find_targets(run_name: str, job_id: Union[str, int, None] = None) -> dict:
     if job_id is not None:
         job_info = report.ResultsReporter().get_jobs(run_name, str(job_id))
-        return job_info.get("targets", dict())
+        return job_info.get("targets") or dict()
     result = dict()
     run_info = report.ResultsReporter().get_jobs(run_name)
     for job_info in run_info:
         if job_info.get("status") not in ("running", "waiting"):
             continue
-        result.update(job_info.get("targets", dict()))
+        result.update(job_info.get("targets") or dict())
     return result

teuthology/test/test_kill.py

@@ -0,0 +1,46 @@
+from unittest.mock import patch
+
+from teuthology.kill import find_targets
+
+
+class TestFindTargets(object):
+    """ Tests for teuthology.kill.find_targets """
+
+    @patch('teuthology.kill.report.ResultsReporter.get_jobs')
+    def test_missing_run_find_targets(self, m_get_jobs):
+        m_get_jobs.return_value = [] 
+        run_targets = find_targets("run-name")
+        assert run_targets == {}
+
+    @patch('teuthology.kill.report.ResultsReporter.get_jobs')
+    def test_missing_job_find_targets(self, m_get_jobs):
+        m_get_jobs.return_value = {} 
+        job_targets = find_targets("run-name", "3")
+        assert job_targets == {}
+
+    @patch('teuthology.kill.report.ResultsReporter.get_jobs')
+    def test_missing_run_targets_find_targets(self, m_get_jobs):
+        m_get_jobs.return_value = [{"targets": None, "status": "waiting"}] 
+        run_targets = find_targets("run-name")
+        assert run_targets == {}
+
+    @patch('teuthology.kill.report.ResultsReporter.get_jobs')
+    def test_missing_job_targets_find_targets(self, m_get_jobs):
+        m_get_jobs.return_value = {"targets": None} 
+        job_targets = find_targets("run-name", "3")
+        assert job_targets == {}
+
+    @patch('teuthology.kill.report.ResultsReporter.get_jobs')
+    def test_run_find_targets(self, m_get_jobs):
+        m_get_jobs.return_value = [{"targets": {"node1": ""}, "status": "running"}]
+        run_targets = find_targets("run-name")
+        assert run_targets == {"node1": ""}
+        m_get_jobs.return_value = [{"targets": {"node1": ""}}]
+        run_targets = find_targets("run-name")
+        assert run_targets == {}
+
+    @patch('teuthology.kill.report.ResultsReporter.get_jobs')
+    def test_job_find_targets(self, m_get_jobs):
+        m_get_jobs.return_value = {"targets": {"node1": ""}}
+        job_targets = find_targets("run-name", "3")
+        assert job_targets == {"node1": ""}