ResultsSerializer.running_jobs_for_run() and test

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/report.py b/teuthology/report.py
index eb425f8c97a85533d022ed903819da86c8e9ba39..d9a83efd61684e8566e1e19215a6757e7d040419 100644 (file)
--- a/teuthology/report.py
+++ b/teuthology/report.py
@@ -115,6 +115,19 @@ class ResultsSerializer(object):
                 jobs[job_id] = job_dir
         return jobs
 
+    def running_jobs_for_run(self, run_name):
+        """
+        Like jobs_for_run(), but only returns jobs with no summary.yaml
+
+        :param run_name: The name of the run.
+        :returns:        A dict like: {'1': '/path/to/1', '2': 'path/to/2'}
+        """
+        jobs = self.jobs_for_run(run_name)
+        for name in jobs.keys():
+            if not os.path.exists(os.path.join(jobs[name], 'summary.yaml')):
+                jobs.pop(name)
+        return jobs
+
     @property
     def all_runs(self):
         """

diff --git a/teuthology/test/fake_archive.py b/teuthology/test/fake_archive.py
index 0a4f2af1acdbe8595c70d0e95850ff3bb0595141..38d5864b506325533f8d0b63df5f5470f3ee4df1 100644 (file)
--- a/teuthology/test/fake_archive.py
+++ b/teuthology/test/fake_archive.py
@@ -79,7 +79,7 @@ class FakeArchive(object):
                 with file(summary_path, 'w') as yfile:
                     yaml.safe_dump(job['summary'], yfile)
 
-    def create_fake_run(self, run_name, job_count, yaml_path):
+    def create_fake_run(self, run_name, job_count, yaml_path, num_hung=0):
         """
         Creates a fake run using run_name. Uses the YAML specified for each
         job's config.yaml
@@ -89,8 +89,13 @@ class FakeArchive(object):
         assert os.path.exists(yaml_path)
         assert job_count > 0
         jobs = []
+        made_hung = 0
         for i in range(job_count):
-            jobs.append(self.get_random_metadata(run_name))
+            if made_hung < num_hung:
+                jobs.append(self.get_random_metadata(run_name, hung=True))
+                made_hung += 1
+            else:
+                jobs.append(self.get_random_metadata(run_name, hung=False))
             #job_config = yaml.safe_load(yaml_path)
         self.populate_archive(run_name, jobs)
         for job in jobs:

diff --git a/teuthology/test/test_report.py b/teuthology/test/test_report.py
index 26501afd4e8d85bbb2a84a4c3b05db85750b1cc9..804254da43ecfb1ce286d76d0096dd2bbb8aad86 100644 (file)
--- a/teuthology/test/test_report.py
+++ b/teuthology/test/test_report.py
@@ -45,6 +45,17 @@ class TestSerializer(object):
         got_jobs = self.reporter.serializer.jobs_for_run(run_name)
         assert sorted(job_ids) == sorted(got_jobs.keys())
 
+    def test_running_jobs_for_run(self):
+        run_name = "test_jobs_for_run"
+        yaml_path = "examples/3node_ceph.yaml"
+        job_count = 10
+        num_hung = 3
+        self.archive.create_fake_run(run_name, job_count, yaml_path,
+                                     num_hung=num_hung)
+
+        got_jobs = self.reporter.serializer.running_jobs_for_run(run_name)
+        assert len(got_jobs) == job_count - num_hung
+
     def test_json_for_job(self):
         run_name = "test_json_for_job"
         yaml_path = "examples/3node_ceph.yaml"