Merge lp:~sylvain-pineau/checkbox/fix-1406719 into lp:checkbox

[Sylvain Pineau]

Fixes the linked bug.

The current job index is incremented (+1) when the tested decides to force the previous test outcome.

[Zygmunt Krynicki (zyga)]

18:04 <@zyga> spineau: hey, I read the checkbox-gui fix, I have no idea how that works
18:04 <@zyga> spineau: it would help if you would describe how those flags are set
18:04 <@zyga> spineau: and how they operate
18:05 <@zyga> spineau: right now I feel we're playing whack-a-mole
18:05 <@zyga> spineau: and the moles never end

[Sylvain Pineau (sylvain-pineau)]

I proposed (see https://bugs.launchpad.net/bugs/1362449) to use the current_job metadata that plainbox provides instead of guessing it with the broken NextRunJobIndex() call when resuming a session. But NextRunJobIndex() works for a normal start so the first boolean (m_resuming) just provides the context (are we resuming a session or not).

But resuming a session can be done in several ways, continue, rerun the last test or mark it as failed/passed.
The last option was not part of the initial fix hence the creation of m_resuming_force_result to store which option the tester selected. If the tester decided to force the previous test status, we basically increment the m_current_job_index to match the right job when resuming a session.

review: Approve

=== modified file 'checkbox-gui/gui-engine/gui-engine.cpp'
--- checkbox-gui/gui-engine/gui-engine.cpp	2014-12-16 14:19:16 +0000
+++ checkbox-gui/gui-engine/gui-engine.cpp	2015-01-05 16:40:40 +0000
@@ -61,6 +61,7 @@
     m_current_job_index(-1),    // -1 ensures correct NextRunJobIndex from clean
     m_running(true),
     m_resuming(false),
+    m_resuming_force_result(false),
     m_waiting_result(false),
     m_running_manual_job(false),
     m_submitted(false),
@@ -501,6 +502,10 @@
                 break;
             }
         }
+        if (m_resuming_force_result) {
+            m_current_job_index++;
+            m_resuming_force_result = false;
+        }
     } else {
         m_current_job_index = NextRunJobIndex(-1);
     }
@@ -643,6 +648,7 @@
         SetJobOutcome(m_current_job_path, continue_pass ? JobResult_OUTCOME_PASS:JobResult_OUTCOME_FAIL, empty);
         // Lets skip this one
         m_rerun_list.removeOne(m_current_job_path);
+        m_resuming_force_result = true;
     }
     qDebug() << "GuiEngine::GuiResumeSession() - Done";
  }

=== modified file 'checkbox-gui/gui-engine/gui-engine.h'
--- checkbox-gui/gui-engine/gui-engine.h	2014-12-16 14:19:16 +0000
+++ checkbox-gui/gui-engine/gui-engine.h	2015-01-05 16:40:40 +0000
@@ -427,6 +427,9 @@
         // Are we resuming a session?
         bool m_resuming;
 
+        // Are we resuming a session and forcing the previous test result?
+        bool m_resuming_force_result;
+
         // Used to preserve interim data from Manual Interaction event
         QDBusObjectPath m_runner;