Merge lp:~kissiel/checkbox/forced-resume into lp:checkbox

[Maciej Kisielewski]

This MR brings forcing of session resume to checkbox-converged.

When build-me is run with --forced-resume flag it will make checkbox to always rerun the last test when starting up checkbox.

To test it run normal build of checkbox-converged + use --forced-resume for ./build-me.
i.e.:

cd checkbox
./mk-venv venv
. venv/bin/activate
cd checkbox-touch
./get-libs
./build-me --forced-resume --ssh 192.168.6.66

Then start checkbox. If there was a previously run session, it should be resumed (if possible).
If not, start a new one, kill the app after few tests, and rerun. It should continue w/o asking.

[Paul Larson (pwlars)]

+1

review: Approve

[Maciej Kisielewski (kissiel)]

w00t, let's land it!

=== modified file 'checkbox-touch/build-me'
--- checkbox-touch/build-me	2016-05-31 09:13:09 +0000
+++ checkbox-touch/build-me	2016-06-09 20:50:36 +0000
@@ -135,6 +135,9 @@
     parser.add_argument("--forced-lang", action='store', type=str,
                         help=("Force checkbox to run in a given language. "
                               "I.e. pl_PL, zh_CN"))
+    parser.add_argument("--forced-resume", action='store_true',
+                        help=("Force checkbox to always resume session (and "
+                              "rerun the last test)."))
     args = parser.parse_args()
     if args.port and not args.ssh:
         parser.error("--port without --ssh doesn't make sense!")
@@ -149,7 +152,8 @@
         "revision": get_revision_string(),
         "clickBuildDate": str(datetime.now().date()),
         "testplan": args.testplan,
-        "providersDir": "providers"
+        "providersDir": "providers",
+        "forcedResume": args.forced_resume
     }
     settings_file = open('settings.json', 'w')
     settings_file.write(json.dumps(settings, sort_keys=True, indent=4))
 
=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2016-05-30 22:07:02 +0000
+++ checkbox-touch/checkbox-touch.qml	2016-06-09 20:50:36 +0000
@@ -460,8 +460,12 @@
     function resumeOrStartSession() {
         app.isSessionResumable(function(result) {
             if (result.resumable === true) {
-                pageStack.clear();
-                pageStack.push(resumeSessionPage);
+                if (appSettings.forcedResume) {
+                    app.resumeSession(true, processNextTest)
+                } else {
+                    pageStack.clear();
+                    pageStack.push(resumeSessionPage);
+                }
             } else {
                 if (result.errors_encountered) {
                     ErrorLogic.showError(mainView, i18n.tr("Could not resume session."),