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

[Sylvain Pineau]

Fix the second half of the linked bug (see the last comments).

The normal_user special env var that I prepared for pm_test was not set when resuming sessions.

This patch reloads it from the session meta_data.

Tested with:

[launcher]
app_id = com.canonical.certification:checkbox-test
launcher_version = 1
stock_reports = text, submission_files

[test plan]
unit = com.canonical.certification::power-management-reboot-poweroff-cert-automated
forced = yes

[test selection]
forced = no

[ui]
output = hide-resource-and-attachment

[daemon]
normal_user = u

##################################""

==================================[ Results ]===================================
32.0kB [00:00, 378kB/s, file=python://stdout]
  job passed : Enumerate available system executables
  job passed : power-management/fwts_wakealarm
  job passed : power-management/poweroff
  job passed : power-management/poweroff-log-attach
  job passed : power-management/reboot
  job passed : power-management/reboot-log-attach

[Jonathan Cave (jocave)]

Looks like a simple and clean fix to the problem at hand. Thanks

review: Approve

diff --git a/plainbox/impl/session/remote_assistant.py b/plainbox/impl/session/remote_assistant.py
index be27c43..3220c3e 100644
--- a/plainbox/impl/session/remote_assistant.py
+++ b/plainbox/impl/session/remote_assistant.py
@@ -614,6 +614,7 @@ class RemoteSessionAssistant():
             return
         _logger.warning("Resuming session: %r", session_id)
         self._normal_user = self._launcher.normal_user
+        _logger.info("normal_user: %r", self._normal_user)
         pass_provider = (None if self._passwordless_sudo else
                          self.get_decrypted_password)
         runner_kwargs = {
@@ -627,6 +628,9 @@ class RemoteSessionAssistant():
         launcher = app_blob['launcher']
         self._launcher.read_string(launcher, False)
         self._sa.use_alternate_configuration(self._launcher)
+        self._normal_user = self._launcher.normal_user
+        _logger.info(
+            "normal_user after loading metadata: %r", self._normal_user)
         test_plan_id = app_blob['testplan_id']
         self._sa.select_test_plan(test_plan_id)
         self._sa.bootstrap()