Merge ~kissiel/plainbox:testplanless-resume into plainbox:master

[Maciej Kisielewski]

Introduce 'testplanless' flag to SessionAssistant to facilitate normal features (like resume) for sessions that don't use test plans.

And also properly set the flags when calling hand_pick_jobs()

[Sylvain Pineau (sylvain-pineau)]

+1 for the new flag, really explicit.

review: Approve

diff --git a/plainbox/impl/session/assistant.py b/plainbox/impl/session/assistant.py
index 253625f..1832516 100644
--- a/plainbox/impl/session/assistant.py
+++ b/plainbox/impl/session/assistant.py
@@ -643,9 +643,12 @@ class SessionAssistant:
             self._restart_strategy.diffuse_application_restart(self._app_id)
         self.session_available(self._manager.storage.id)
         _logger.debug("Session resumed: %s", session_id)
-        UsageExpectation.of(self).allowed_calls = {
-            self.select_test_plan: "to save test plan selection",
-        }
+        if SessionMetaData.FLAG_TESTPLANLESS in self._metadata.flags:
+            UsageExpectation.of(self).allowed_calls = self._get_allowed_calls_in_normal_state()
+        else:
+            UsageExpectation.of(self).allowed_calls = {
+                self.select_test_plan: "to save test plan selection",
+            }
         return self._metadata
 
     @raises(UnexpectedMethodCall)
@@ -905,6 +908,7 @@ class SessionAssistant:
                 '^{}$'.format(pattern)), Origin('hand-pick')))
         jobs = select_jobs(self._context.state.job_list, qualifiers)
         self._context.state.update_desired_job_list(jobs)
+        self._metadata.flags = {'incomplete', 'testplanless'}
         UsageExpectation.of(self).allowed_calls = (
             self._get_allowed_calls_in_normal_state())
 
diff --git a/plainbox/impl/session/state.py b/plainbox/impl/session/state.py
index a225986..0fd2ac2 100644
--- a/plainbox/impl/session/state.py
+++ b/plainbox/impl/session/state.py
@@ -70,6 +70,10 @@ class SessionMetaData:
     # once the testing begin
     FLAG_BOOTSTRAPPING = "bootstrapping"
 
+    # Flag indicating that session is using hand-picked list of jobs
+    # and is not following any test plan
+    FLAG_TESTPLANLESS = "testplanless"
+
     def __init__(self, title=None, flags=None, running_job_name=None,
                  app_blob=None, app_id=None):
         """Initialize a new session state meta-data object."""