Merge ~jocave/checkbox-ng:modify-bootstrap-output into checkbox-ng:master

[Jonathan Cave]

Usefulness of bootstrap job output is probably quite subjective, however I found these changes useful in identifying possible issues during this stage of test runs.

Having the job id available means you ensure presence of particular job and ordering. The use of the PianoUI provides are alert that something might be wrong that could effect jobs in main body of the test run.

Estimated duration is almost useless in my experience.

Depends on:
https://code.launchpad.net/~jocave/plainbox/+git/plainbox/+merge/335384

[Sheila Miguez (codersquid)]

Sounds reasonable.

review: Approve

[Sylvain Pineau (sylvain-pineau)]

Your patch highlights an existing bug, see below in the inline comment.

review: Needs Fixing

[Sylvain Pineau (sylvain-pineau)]

Since you're not using the estimated_time in the new version, let's completely remove those lines in _run_bootstrap_jobs():

        estimated_time = 0
        for job_id in jobs_to_run:
            job = self.sa.get_job(job_id)
            if (job.estimated_duration is not None and
                    estimated_time is not None):
                estimated_time += job.estimated_duration
            else:
                estimated_time = None

[...]

            if (job.estimated_duration is not None and
                    estimated_time is not None):
                estimated_time -= job.estimated_duration

review: Needs Fixing

[Jonathan Cave (jocave)]

Reviewed in light of good point that estimated_duration code could be removed. Last commit simplifies things a bit.

Let me know if these commits should be squashed.

[Sylvain Pineau (sylvain-pineau)]

Let's keep your branch history, I think it helps. Clear to land!

review: Approve

diff --git a/checkbox_ng/launcher/stages.py b/checkbox_ng/launcher/stages.py
index 93f4a8c..2836520 100644
--- a/checkbox_ng/launcher/stages.py
+++ b/checkbox_ng/launcher/stages.py
@@ -223,27 +223,12 @@ class MainLoopStage(metaclass=abc.ABCMeta):
                 estimated_time -= job.estimated_duration
 
     def _run_bootstrap_jobs(self, jobs_to_run):
-        estimated_time = 0
-        for job_id in jobs_to_run:
-            job = self.sa.get_job(job_id)
-            if (job.estimated_duration is not None and
-                    estimated_time is not None):
-                estimated_time += job.estimated_duration
-            else:
-                estimated_time = None
         for job_no, job_id in enumerate(jobs_to_run, start=1):
             print(self.C.header(
-                _('Running bootstrapping job {} / {}. Estimated time left: {}').format(
-                    job_no, len(jobs_to_run),
-                    seconds_to_human_duration(max(0, estimated_time))
-                    if estimated_time is not None else _("unknown")),
-                fill='-'))
-            job = self.sa.get_job(job_id)
-            result_builder = self.sa.run_job(job.id, 'silent', False)
+                _('Bootstrap {} ({}/{})').format(
+                    job_id, job_no, len(jobs_to_run), fill='-')))
+            result_builder = self.sa.run_job(job_id, 'piano', False)
             self.sa.use_job_result(job_id, result_builder.get_result())
-            if (job.estimated_duration is not None and
-                    estimated_time is not None):
-                estimated_time -= job.estimated_duration
 
     def _pick_action_cmd(self, action_list, prompt=None):
         return ActionUI(action_list, prompt).run()