Merge lp:~zyga/checkbox/story-1063 into lp:checkbox

[Zygmunt Krynicki]

9d63656 Revert "plainbox: crazy-hack, add hacky template dependencies"

[Daniel Manrique (roadmr)]

ohh and I really liked the crazy hack :/

review: Approve

[Zygmunt Krynicki (zyga)]

I'll come back as a full feature but for now it has to go (release time soon)

On Fri, Aug 8, 2014 at 3:45 PM, Daniel Manrique
<email address hidden> wrote:
> The proposal to merge lp:~zkrynicki/checkbox/story-1063 into lp:checkbox has been updated.
>
> Status: Needs review => Approved
>
> For more details, see:
> https://code.launchpad.net/~zkrynicki/checkbox/story-1063/+merge/230098
> --
> https://code.launchpad.net/~zkrynicki/checkbox/story-1063/+merge/230098
> You are the owner of lp:~zkrynicki/checkbox/story-1063.

=== modified file 'plainbox/plainbox/impl/commands/analyze.py'
--- plainbox/plainbox/impl/commands/analyze.py	2014-08-04 16:51:36 +0000
+++ plainbox/plainbox/impl/commands/analyze.py	2014-08-08 12:25:36 +0000
@@ -56,7 +56,7 @@
                 p.get_units()[0] for p in provider_list]))
         self.session = SessionState(self.unit_list)
         self.desired_job_list = self._get_matching_job_list(
-            ns, self.session.job_list + self.session.get_fake_job_list())
+            ns, self.session.job_list)
         self.problem_list = self.session.update_desired_job_list(
             self.desired_job_list)
 
@@ -126,7 +126,7 @@
         result = runner.run_job(job, self.config)
         self.session.update_job_result(job, result)
         new_desired_job_list = self._get_matching_job_list(
-            self.ns, self.session.job_list + self.session.get_fake_job_list())
+            self.ns, self.session.job_list)
         new_problem_list = self.session.update_desired_job_list(
             new_desired_job_list)
         if new_problem_list:

=== modified file 'plainbox/plainbox/impl/commands/run.py'
--- plainbox/plainbox/impl/commands/run.py	2014-08-04 16:51:44 +0000
+++ plainbox/plainbox/impl/commands/run.py	2014-08-08 12:25:36 +0000
@@ -685,7 +685,7 @@
         # Compute the desired job list, this can give us notification about
         # problems in the selected jobs. Currently we just display each problem
         desired_job_list = self._get_matching_job_list(
-            self.ns, self.state.job_list + self.state.get_fake_job_list())
+            self.ns, self.state.job_list)
         print(self.C.header(_("Analyzing Jobs")))
         self._update_desired_job_list(desired_job_list)
 
@@ -956,7 +956,7 @@
         _run_all_selected_jobs()
         """
         new_matching_job_list = self._get_matching_job_list(
-            self.ns, self.state.job_list + self.state.get_fake_job_list())
+            self.ns, self.state.job_list)
         self._update_desired_job_list(new_matching_job_list)
         self._backtrack_and_run_missing = True
 

=== modified file 'plainbox/plainbox/impl/ctrl.py'
--- plainbox/plainbox/impl/ctrl.py	2014-08-04 16:51:36 +0000
+++ plainbox/plainbox/impl/ctrl.py	2014-08-08 12:25:36 +0000
@@ -115,12 +115,9 @@
         """
         direct = DependencyMissingError.DEP_TYPE_DIRECT
         resource = DependencyMissingError.DEP_TYPE_RESOURCE
-        result = set(itertools.chain(
+        return set(itertools.chain(
             zip(itertools.repeat(direct), job.get_direct_dependencies()),
             zip(itertools.repeat(resource), job.get_resource_dependencies())))
-        if hasattr(job, 'template_resource_id'):
-            result.add((resource, job.template_resource_id))
-        return result
 
     def get_inhibitor_list(self, session_state, job):
         """

=== modified file 'plainbox/plainbox/impl/secure/qualifiers.py'
--- plainbox/plainbox/impl/secure/qualifiers.py	2014-08-04 16:51:36 +0000
+++ plainbox/plainbox/impl/secure/qualifiers.py	2014-08-08 12:25:36 +0000
@@ -129,9 +129,6 @@
         This method should not be called directly, it is an implementation
         detail of SimpleQualifier class.
         """
-        if getattr(job, 'is_fake', False):
-            should_match = re.match(job.id, self.pattern_text[1:-1]) is not None
-            return should_match
         return self._pattern.match(job.id) is not None
 
     @property

=== modified file 'plainbox/plainbox/impl/session/state.py'
--- plainbox/plainbox/impl/session/state.py	2014-08-04 16:51:36 +0000
+++ plainbox/plainbox/impl/session/state.py	2014-08-08 12:25:36 +0000
@@ -21,7 +21,6 @@
 :mod:`plainbox.impl.session.state` -- session state handling
 ============================================================
 """
-import itertools
 import logging
 
 from plainbox.i18n import gettext as _
@@ -29,7 +28,6 @@
 from plainbox.impl.depmgr import DependencyDuplicateError
 from plainbox.impl.depmgr import DependencyError
 from plainbox.impl.depmgr import DependencySolver
-from plainbox.impl.resource import Resource
 from plainbox.impl.session.jobs import JobState
 from plainbox.impl.session.jobs import UndesiredJobReadinessInhibitor
 from plainbox.impl.signal import Signal
@@ -431,16 +429,13 @@
         # to remove a problematic job and re-try. The loop provides a stop
         # condition as we will eventually run out of jobs.
         problems = []
-        # Get additional fake jobs that might be generated if we instantiate
-        # templates later on, from resources we don't yet have.
-        fake_job_list = self.get_fake_job_list()
         while self._desired_job_list:
             # XXX: it might be more efficient to incorporate this 'recovery
             # mode' right into the solver, this way we'd probably save some
             # resources or runtime complexity.
             try:
                 self._run_list = DependencySolver.resolve_dependencies(
-                    self._job_list + fake_job_list, self._desired_job_list)
+                    self._job_list, self._desired_job_list)
             except DependencyError as exc:
                 # When a dependency error is detected remove the affected job
                 # form _desired_job_list and try again.
@@ -451,10 +446,6 @@
             else:
                 # Don't iterate the loop if there was no exception
                 break
-        # Filter-out fake jobs before we try to show them
-        self._run_list = [
-            job for job in self._run_list
-            if getattr(job, 'is_fake', False) is False]
         # Update all job readiness state
         self._recompute_job_readiness()
         # Return all dependency problems to the caller
@@ -645,28 +636,6 @@
         """
         return self._job_list
 
-    def get_fake_job_list(self):
-        fake_job_list = []
-        for unit in self.unit_list:
-            if unit.unit != 'template':
-                continue
-            resource_id = unit.resource_id
-            state = self.job_state_map.get(resource_id)
-            if state is not None and state.result.outcome is None:
-                fake_params = Resource({
-                    key: '.*'
-                    for key in set(
-                        itertools.chain(
-                            *unit.get_accessed_parameters(
-                                force=True).values()))
-                })
-                fake_job = unit.instantiate_one(fake_params)
-                fake_job.is_fake = True
-                fake_job.template_resource_id = resource_id
-                logger.debug("Adding fake job: %s", fake_job.id)
-                fake_job_list.append(fake_job)
-        return fake_job_list
-
     @property
     def unit_list(self):
         """