Merge ~sylvain-pineau/checkbox-ng:fix-1805580 into checkbox-ng:master

[Sylvain Pineau]

Fixes the linked bug (warning remote api bump inside)

Tested using a master & slave on the same network.

Selected test plan was forced, test selection not. Test plan was loading data for 60 jobs.

Before: 70s to get the test selection screen
After: 3.5s

[Maciej Kisielewski (kissiel)]

Great optimization.
+1!

review: Approve

[Jonathan Cave (jocave)]

Tried this on a classic system using checkbox-snappy-classic installed a slow device. Time to the job selection screen was very short. Looks good to me, thanks!

review: Approve

diff --git a/checkbox_ng/launcher/master.py b/checkbox_ng/launcher/master.py
index f110860..99bdbba 100644
--- a/checkbox_ng/launcher/master.py
+++ b/checkbox_ng/launcher/master.py
@@ -23,6 +23,7 @@ import contextlib
 import getpass
 import gettext
 import ipaddress
+import json
 import logging
 import os
 import select
@@ -264,8 +265,6 @@ class RemoteMaster(ReportsStage, MainLoopStage):
         configuration['normal_user'] = self._normal_user
 
         tps = self.sa.start_session(configuration)
-        _logger.debug("master: Session started. Available TPs:\n%s",
-                      '\n'.join(['  ' + tp[0] for tp in tps]))
         if self.launcher.test_plan_forced:
             self.select_tp(self.launcher.test_plan_default_selection)
             self.select_jobs(self.jobs)
@@ -330,7 +329,7 @@ class RemoteMaster(ReportsStage, MainLoopStage):
                 )
         else:
             _logger.info("master: Selecting jobs.")
-            reprs = self.sa.get_jobs_repr(all_jobs)
+            reprs = json.loads(self.sa.get_jobs_repr(all_jobs))
             wanted_set = CategoryBrowser(
                 "Choose tests to run on your system:", reprs).run()
             # no need to set an alternate selection if the job list not changed
@@ -403,7 +402,8 @@ class RemoteMaster(ReportsStage, MainLoopStage):
             time.sleep(20)
         else:
             resume_dialog(10)
-        jobs_repr = self.sa.get_jobs_repr([resumed_session_info['last_job']])
+        jobs_repr = json.loads(
+            self.sa.get_jobs_repr([resumed_session_info['last_job']]))
         job = jobs_repr[-1]
         SimpleUI.header(job['name'])
         print(_("ID: {0}").format(job['id']))
@@ -422,7 +422,8 @@ class RemoteMaster(ReportsStage, MainLoopStage):
                       '\n'.join(['  ' + job for job in jobs]))
         total_num = len(jobs['done']) + len(jobs['todo'])
 
-        jobs_repr = self.sa.get_jobs_repr(jobs['todo'], len(jobs['done']))
+        jobs_repr = json.loads(
+            self.sa.get_jobs_repr(jobs['todo'], len(jobs['done'])))
         if any([x['user'] is not None for x in jobs_repr]):
             self.password_query()
 
@@ -524,22 +525,24 @@ class RemoteMaster(ReportsStage, MainLoopStage):
         # include resource jobs that jobs to retry depend on
 
         candidates = self.sa.prepare_rerun_candidates(rerun_candidates)
-        self._run_jobs(self.sa.get_jobs_repr(candidates), len(candidates))
+        self._run_jobs(
+            json.loads(self.sa.get_jobs_repr(candidates)), len(candidates))
         return True
 
     def _maybe_manual_rerun_jobs(self):
         rerun_candidates = self.sa.get_rerun_candidates('manual')
         if not rerun_candidates:
             return False
-        test_info_list = self.sa.get_jobs_repr(
-            [j.id for j in rerun_candidates])
+        test_info_list = json.loads(
+            self.sa.get_jobs_repr([j.id for j in rerun_candidates]))
         wanted_set = ReRunBrowser(
             _("Select jobs to re-run"), test_info_list, rerun_candidates).run()
         if not wanted_set:
             return False
         candidates = self.sa.prepare_rerun_candidates([
             job for job in rerun_candidates if job.id in wanted_set])
-        self._run_jobs(self.sa.get_jobs_repr(candidates), len(candidates))
+        self._run_jobs(
+            json.loads(self.sa.get_jobs_repr(candidates)), len(candidates))
         return True
 
     def _run_jobs(self, jobs_repr, total_num=0):
diff --git a/checkbox_ng/urwid_ui.py b/checkbox_ng/urwid_ui.py
index 2d5b579..572cba8 100644
--- a/checkbox_ng/urwid_ui.py
+++ b/checkbox_ng/urwid_ui.py
@@ -250,7 +250,7 @@ class CategoryNode(urwid.ParentNode):
         else:
             value = next(
                 (job['partial_id'], job['name']) for job in test_info_list
-                if job.get("id") == key)
+                    if job["id"] == key)
             return JobNode(
                 value, parent=self, key=key, depth=self.get_depth() + 1)
 
@@ -457,7 +457,7 @@ class RerunNode(CategoryNode):
         else:
             value = next(
                 (job['partial_id'], job['name']) for job in test_info_list
-                if job.get("id") == key)
+                if job["id"] == key)
             return JobNode(
                 value, parent=self, key=key, depth=self.get_depth() + 1)
 
diff --git a/plainbox/impl/session/remote_assistant.py b/plainbox/impl/session/remote_assistant.py
index 4c0a379..2e679a7 100644
--- a/plainbox/impl/session/remote_assistant.py
+++ b/plainbox/impl/session/remote_assistant.py
@@ -139,7 +139,7 @@ class BackgroundExecutor(Thread):
 class RemoteSessionAssistant():
     """Remote execution enabling wrapper for the SessionAssistant"""
 
-    REMOTE_API_VERSION = 10
+    REMOTE_API_VERSION = 11
 
     def __init__(self, cmd_callback):
         _logger.debug("__init__()")
@@ -595,7 +595,7 @@ class RemoteSessionAssistant():
                 "plugin": job.plugin,
             }
             test_info_list = test_info_list + ((test_info, ))
-        return test_info_list
+        return json.dumps(test_info_list)
 
     def resume_by_id(self, session_id=None):
         _logger.info("resume_by_id: %r", session_id)