Merge lp:~sylvain-pineau/checkbox/fix-1578579 into lp:checkbox

[Sylvain Pineau]

Fixes the linked bug.

To avoid the plainbox crash mentioned in the bug report where we had leftover jobs when resuming a session a simple fix is to avoid rerunning jobs in the bootstrap method if we already have results for them. Doing so avoid generating a new set of jobs from templates, where one could be missing if udev does not report the same device list (It can be as simple as unplugging a USB mouse).

[Pierre Equoy (pieq)]

I tested this patch on the device where lp:1578579 was found, and it does, indeed, fix the problem.

I thought it might introduce a regression with the job results history, but after testing it a bit more it seems OK and the whole history is kept even when the session is resumed.

+1, thanks a lot!

review: Approve

[Sylvain Pineau (sylvain-pineau)]

The job history is not always kept, I just avoid rerun the bootstrap include jobs on resume which is often limited to 3-4 resource jobs (device, package, graphic cards and fwts)

=== modified file 'checkbox-ng/launchers/checkbox-cli'
--- checkbox-ng/launchers/checkbox-cli	2016-05-10 18:04:53 +0000
+++ checkbox-ng/launchers/checkbox-cli	2016-05-14 14:07:58 +0000
@@ -312,14 +312,8 @@
         app_blob = json.loads(metadata.app_blob.decode("UTF-8"))
         test_plan_id = app_blob['testplan_id']
         last_job = metadata.running_job_name
-        # FIXME selecting again the testplan on resume resets both # the static
-        # and dynamic todo lists.  # We're then saving the selection from the
-        # saved run_list # by accessing the session private context object.
-        selected_id_list = [job.id for job in
-                            self.ctx.sa._context.state.run_list]
         self.ctx.sa.select_test_plan(test_plan_id)
         self.ctx.sa.bootstrap()
-        self.ctx.sa.use_alternate_selection(selected_id_list)
         # If we resumed maybe not rerun the same, probably broken job
         self._handle_last_job_after_resume(last_job)
 
 
=== modified file 'plainbox/plainbox/impl/session/assistant.py'
--- plainbox/plainbox/impl/session/assistant.py	2016-04-04 18:24:10 +0000
+++ plainbox/plainbox/impl/session/assistant.py	2016-05-14 14:07:58 +0000
@@ -852,6 +852,8 @@
         self._context.state.update_desired_job_list(
             desired_job_list, include_mandatory=False)
         for job in self._context.state.run_list:
+            if self._context.state.job_state_map[job.id].result_history:
+                continue
             UsageExpectation.of(self).allowed_calls[self.run_job] = (
                 "to run bootstrapping job")
             rb = self.run_job(job.id, 'silent', False)