Merge lp:~brendan-donegan/checkbox/which_requirements into lp:checkbox

[Brendan Donegan]

This branch shows which requirements failed if a job doesn't run because of not meeting them. This helps greatly in debugging and is just useful info to have.

[lp:~brendan-donegan/checkbox/which_requirements]

1091. By Brendan Donegan on 2011-10-18

Merged from trunk.

[Brendan Donegan (brendan-donegan)]

This ones been sitting around for a while. Would be nice if someone could have a look at merging it.

[Daniel Manrique (roadmr)]

This had already been marged, so approving and merging to trunk again.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-18 09:47:45 +0000
+++ debian/changelog	2011-10-18 10:59:23 +0000
@@ -1,5 +1,8 @@
 checkbox (0.13) precise; urgency=low
 
+  [Brendan Donegan]
+  * Show details of unmet job requirements (LP: #855852)
+
   [Marc Tardif]
   * Generate a submission.xml file that contains all device and attachment
     information, suitable for offline processing and submission.

=== modified file 'plugins/resource_info.py'
--- plugins/resource_info.py	2011-09-23 07:36:00 +0000
+++ plugins/resource_info.py	2011-10-18 10:59:23 +0000
@@ -34,9 +34,15 @@
     def prompt_job(self, interface, job):
         mask = []
         values = []
+        failed_requirements = []
+
         for require in job.get("requires", []):
             new_values = self.resources.eval(require)
             mask.append(bool(new_values))
+
+            if not bool(new_values):
+                failed_requirements.append(require)
+
             if new_values is not None:
                 values.extend(new_values)
 
@@ -45,7 +51,14 @@
 
         else:
             job["status"] = UNSUPPORTED
-            job["data"] = "Job requirements not met."
+
+            data = "Job requirement%s not met:" % (
+                's' if len(failed_requirements) > 1 else '')
+            
+            for failed_require in failed_requirements:
+                data = data + " '" + failed_require + "'"
+                
+            job["data"] = data
             self._manager.reactor.stop()
 
     def report_resource(self, resource):