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

[Sylvain Pineau]

checkbox remote is broken (again) since:

https://git.launchpad.net/checkbox-ng/commit/?id=511e6f6e7f2e29ed994dabfba614097d722caa08

The way the session type is extracted from session titles does not work as launchers are setting
a different value causing the type to fallback to "local".

The patch evaluates the session type based on the session metadata app blob instead.

Tested using the dev ppa version (to verify the behavior of the deb restart strategy) and this patch applied manually (on jammy beta)

[Maciej Kisielewski (kissiel)]

Neverending story :)
LGTM, +1

review: Approve

diff --git a/plainbox/impl/session/assistant.py b/plainbox/impl/session/assistant.py
index 7afe1a9..41ec411 100644
--- a/plainbox/impl/session/assistant.py
+++ b/plainbox/impl/session/assistant.py
@@ -247,7 +247,7 @@ class SessionAssistant:
         if self._restart_strategy is None:
             # 'checkbox-slave' is deprecated, it's here so people can resume
             # old session, the next if statement can be changed to just checking
-            # for 'remote' title
+            # for 'remote' type
             # session_type = 'remote' if self._metadata.title == 'remote'
             #                         else 'local'
             # with the next release or when we do inclusive naming refactor
@@ -255,10 +255,14 @@ class SessionAssistant:
             # TODO: REMOTE API RAPI:
             # this heuristic of guessing session type from the title
             # should be changed to a proper arg/flag with the Remote API bump
-            remote_titles = ('remote', 'checkbox-slave')
-            if self._metadata and self._metadata.title in remote_titles:
-                session_type = 'remote'
-            else:
+            remote_types = ('remote', 'checkbox-slave')
+            session_type = 'local'
+            try:
+                app_blob = json.loads(self._metadata.app_blob.decode("UTF-8"))
+                session_type = app_blob['type']
+                if session_type in remote_types:
+                    session_type = 'remote'
+            except (AttributeError, ValueError, KeyError):
                 session_type = 'local'
             self._restart_strategy = detect_restart_strategy(
                 self, session_type=session_type)