Merge lp:~zyga/checkbox/fix-1369819 into lp:checkbox

[Zygmunt Krynicki]

This branch fixes a crash in checkbox-ng cli (both old and new) related to the IJobQualifier API transition.

[Sylvain Pineau (sylvain-pineau)]

tested ok with canonical-certification-cli.

+1

review: Approve

=== modified file 'checkbox-ng/checkbox_ng/commands/newcli.py'
--- checkbox-ng/checkbox_ng/commands/newcli.py	2014-08-05 15:33:06 +0000
+++ checkbox-ng/checkbox_ng/commands/newcli.py	2014-09-16 09:21:51 +0000
@@ -43,13 +43,14 @@
 from plainbox.impl.exporter.html import HTMLSessionStateExporter
 from plainbox.impl.exporter.xml import XMLSessionStateExporter
 from plainbox.impl.secure.config import Unset, ValidationError
+from plainbox.impl.secure.origin import Origin
 from plainbox.impl.secure.qualifiers import FieldQualifier
 from plainbox.impl.secure.qualifiers import OperatorMatcher
+from plainbox.impl.secure.qualifiers import select_jobs
 from plainbox.impl.secure.qualifiers import WhiteList
-from plainbox.impl.secure.qualifiers import select_jobs
 from plainbox.impl.session import SessionMetaData
+from plainbox.impl.transport import get_all_transports
 from plainbox.impl.transport import TransportError
-from plainbox.impl.transport import get_all_transports
 from plainbox.vendor.textland import get_display
 
 from checkbox_ng.misc import SelectableJobTreeNode
@@ -268,8 +269,10 @@
         # non-local jobs and we're done.
         qualifier_list = []
         qualifier_list.extend(self._whitelists)
+        origin = Origin.get_caller_origin()
         qualifier_list.append(FieldQualifier(
-            'plugin', OperatorMatcher(operator.ne, 'local'), inclusive=False))
+            'plugin', OperatorMatcher(operator.ne, 'local'), origin,
+            inclusive=False))
         local_job_list = select_jobs(
             self.manager.state.job_list, qualifier_list)
         self._update_desired_job_list(local_job_list)

=== modified file 'checkbox-ng/checkbox_ng/commands/oldcli.py'
--- checkbox-ng/checkbox_ng/commands/oldcli.py	2014-09-03 22:09:16 +0000
+++ checkbox-ng/checkbox_ng/commands/oldcli.py	2014-09-16 09:21:51 +0000
@@ -18,6 +18,7 @@
 from plainbox.impl.runner import JobRunner
 from plainbox.impl.runner import slugify
 from plainbox.impl.secure.config import Unset
+from plainbox.impl.secure.origin import Origin
 from plainbox.impl.secure.qualifiers import CompositeQualifier
 from plainbox.impl.secure.qualifiers import NonLocalJobQualifier
 from plainbox.impl.secure.qualifiers import WhiteList
@@ -134,7 +135,8 @@
                 manager.state.job_list,
                 [CompositeQualifier(
                     self.whitelists +
-                    [NonLocalJobQualifier(inclusive=False)]
+                    [NonLocalJobQualifier(
+                        Origin.get_caller_origin(), inclusive=False)]
                 )])
             self._update_desired_job_list(manager, desired_job_list)
             # Ask the password before anything else in order to run local jobs