Update tests as per review

checkbox-ng/plainbox/impl/session/test_resume.py

@@ -2033,11 +2033,13 @@ def test_simple_session(self):
 
     def test_simple_session_with_rejected(self):
         """
-        verify that _restore_SessionState_jobs_and_results() works when
-        faced with a representation of a simple session (no generated jobs
-        or anything "exotic").
+        verify that _restore_SessionState_jobs_and_results() also resumes in
+        the job_state_map jobs that were manually excluded from the user
+        (rejected jobs)
         """
         job = make_job(id="job")
+        # this job was de-selected by the user manually in the test selection
+        # screen
         job1 = make_job(id="job1")
         session_repr = {
             "jobs": {job.id: job.checksum, job1.id: job1.checksum},

metabox/metabox/scenarios/restart/agent_respawn.py

@@ -166,18 +166,26 @@ class ResumeAfterFinishPreserveOutputRemote(Scenario):
 
 @tag("resume", "manual", "regression")
 class ResumePreservesRejectedJobsStateMap(Scenario):
+    """
+    Check that the job_state_map survives both manual closure and restarts
+    """
+
     launcher = "# no launcher"
     steps = [
         Start(),
         Expect("Select test plan"),
-        SelectTestPlan("2021.com.canonical.certification::pass-and-crash"),
+        SelectTestPlan(
+            "2021.com.canonical.certification::checkbox-crash-then-reboot"
+        ),
         Send(keys.KEY_ENTER),
         Expect("Press (T) to start"),
         Send(keys.KEY_ENTER),
-        Expect("basic-shell-crashing"),
+        Expect("Crash Checkbox"),
         Send(keys.KEY_DOWN + keys.KEY_SPACE),
         Expect("[ ]"),
         Send("T"),
+        Expect("Waiting for the system to shut down or reboot"),
+        Start(),
         Expect("Do you want to submit 'upload to certification' report?"),
         Signal(keys.SIGINT),
         Start(),