From: Zack Cerza <zack@cerza.org>
Date: Thu, 17 Apr 2014 16:17:22 +0000 (-0500)
Subject: Refactor try_delete_jobs()
X-Git-Tag: v11.1.1~58^2^2~902^2~243^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=03b8cdac387249f12dcbf92bf01b9678426d66a8;p=ceph.git

Refactor try_delete_jobs()

Also tweak its error message
---

diff --git a/teuthology/report.py b/teuthology/report.py
index de1f5e4283bd6..c8c290b873fa9 100644
--- a/teuthology/report.py
+++ b/teuthology/report.py
@@ -436,12 +436,15 @@ def try_delete_jobs(run_name, job_ids):
     reporter = ResultsReporter()
     log.debug("Deleting jobs from {server}: {jobs}".format(
         server=config.results_server, jobs=str(job_ids)))
-    for job_id in job_ids:
+
+    def try_delete_job(job_id):
         with safe_while(_raise=False) as proceed:
             while proceed():
                 try:
                     reporter.delete_job(run_name, job_id)
                     return
                 except (requests.exceptions.RequestException, socket.error):
-                    log.exception("Could not report results to %s",
-                                  config.results_server)
+                    log.exception("Job deletion failed")
+
+    for job_id in job_ids:
+        try_delete_job(job_id)