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

[Sylvain Pineau]

Fix the qml-shell based jobs on 18.04

Tested on 16.04 and 18.04 with palm rejection job:

$ checkbox-cli run .*collect-manifest com.canonical.certification::touchscreen/3-touch-tap com.canonical.certification::touchpad/palm-rejection

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[trusty] starting container
[trusty] (timing) 0.01user 0.01system 0:00.28elapsed 9%CPU (0avgtext+0avgdata 4984maxresident)k
[trusty] (timing) 0inputs+72outputs (0major+1433minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] (timing) 68.48user 207.74system 9:45.87elapsed 47%CPU (0avgtext+0avgdata 68500maxresident)k
[trusty] (timing) 105640inputs+1491240outputs (48major+1301260minor)pagefaults 0swaps
[trusty-testing] Starting tests...
Found a test script: ./requirements/001-container-tests-plainbox-egg-info
[trusty-testing] 001-container-tests-plainbox-egg-info: PASS
[trusty-testing] (timing) 0.22user 0.03system 0:00.37elapsed 68%CPU (0avgtext+0avgdata 24396maxresident)k
[trusty-testing] (timing) 224inputs+88outputs (1major+9375minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-checkbox-documentation
[trusty-testing] container-tests-checkbox-documentation: PASS
[trusty-testing] (timing) 0.03user 0.01system 0:00.07elapsed 58%CPU (0avgtext+0avgdata 10460maxresident)k
[trusty-testing] (timing) 0inputs+0outputs (0major+2608minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-checkbox-ng-unit
[trusty-testing] container-tests-checkbox-ng-unit: FAIL
[trusty-testing] stdout: https://paste.ubuntu.com/p/nTtQXVhyKf/
[trusty-testing] stderr: https://paste.ubuntu.com/p/qCWFs9ZGkP/
[trusty-testing] (timing) Command exited with non-zero status 1
[trusty-testing] (timing) 10.96user 0.87system 0:14.67elapsed 80%CPU (0avgtext+0avgdata 74044maxresident)k
[trusty-testing] (timing) 2224inputs+54184outputs (22major+478780minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-providers-internal
[trusty-testing] container-tests-providers-internal: PASS
[trusty-testing] (timing) 8.99user 0.77system 0:12.78elapsed 76%CPU (0avgtext+0avgdata 61428maxresident)k
[trusty-testing] (timing) 0inputs+48032outputs (0major+469107minor)pagefaults 0swaps
[trusty-testing] Fixing file permissions in source directory
[trusty-testing] Destroying container
Name: trusty-testing
State: STOPPED
[xenial] starting container
[xenial] (timing) 0.00user 0.01system 0:00.26elapsed 4%CPU (0avgtext+0avgdata 4932maxresident)k
[xenial] (timing) 0inputs+72outputs (0major+1434minor)pagefaults 0swaps
[xenial] provisioning container
[xenial] (timing) 31.10user 17.22system 5:32.36elapsed 14%CPU (0avgtext+0avgdata 82412maxresident)k
[xenial] (timing) 12288inputs+1504864outputs (68major+1439525minor)pagefaults 0swaps
[xenial-testing] Starting tests...
Found a test script: ./requirements/001-container-tests-plainbox-egg-info
[xenial-testing] 001-container-tests-plainbox-egg-info: PASS
[xenial-testing] (timing) 0.20user 0.03system 0:00.26elapsed 89%CPU (0avgtext+0avgdata 25356maxresident)k
[xenial-testing] (timing) 0inputs+88outputs (0major+9563minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-checkbox-documentation
[xenial-testing] container-tests-checkbox-documentation: PASS
[xenial-testing] (timing) 1.50user 0.08system 0:02.33elapsed 68%CPU (0avgtext+0avg...

review: Needs Fixing

diff --git a/plainbox/data/qml-shell/plainbox_qml_shell.qml b/plainbox/data/qml-shell/plainbox_qml_shell.qml
index 84c3681..600208e 100644
--- a/plainbox/data/qml-shell/plainbox_qml_shell.qml
+++ b/plainbox/data/qml-shell/plainbox_qml_shell.qml
@@ -45,13 +45,13 @@ Window {
         Component.onCompleted: {
             addImportPath(Qt.resolvedUrl('.'));
             py.importModule('pipe_handler', function() {
-                py.readAndClose(Qt.application.arguments[8], function(testingShellData) {
+                py.readAndClose(Qt.application.arguments[5], function(testingShellData) {
                     var new_data = JSON.parse(testingShellData);
                     for (var attrname in new_data) { testingShell[attrname] = new_data[attrname]; }
                     testingShell.getTest = function() {
                         return testingShell['job_repr'];
                     }
-                    loader.setSource(Qt.application.arguments[4],
+                    loader.setSource(Qt.application.arguments[3],
                                      {'testingShell': testingShell});
                 });
             });
@@ -87,6 +87,6 @@ Window {
 
     function testDone(res) {
         var json_str = JSON.stringify(res) || ""
-        py.writeAndClose(json_str, Qt.application.arguments[6], Qt.quit);
+        py.writeAndClose(json_str, Qt.application.arguments[4], Qt.quit);
     }
 }
diff --git a/plainbox/impl/ctrl.py b/plainbox/impl/ctrl.py
index c1792d5..90f2296 100644
--- a/plainbox/impl/ctrl.py
+++ b/plainbox/impl/ctrl.py
@@ -850,9 +850,8 @@ class QmlJobExecutionController(CheckBoxExecutionController):
             List of command arguments
 
         """
-        cmd = ['qmlscene', '-I', self.QML_MODULES_PATH, '--job', job.qml_file,
-               '--fd-out', shell_out_fd, '--fd-in', shell_in_fd,
-               self.QML_SHELL_PATH]
+        cmd = ['qmlscene', '-I', self.QML_MODULES_PATH, job.qml_file,
+               shell_out_fd, shell_in_fd, self.QML_SHELL_PATH]
         return cmd
 
     def get_checkbox_score(self, job):
diff --git a/plainbox/impl/test_ctrl.py b/plainbox/impl/test_ctrl.py
index 63ec4b3..e3f1277 100644
--- a/plainbox/impl/test_ctrl.py
+++ b/plainbox/impl/test_ctrl.py
@@ -1091,9 +1091,8 @@ class QmlJobExecutionControllerTests(CheckBoxExecutionControllerTestsMixIn,
             self.ctrl.get_execution_command(
                 self.job, self.job_state, self.config, self.SESSION_DIR,
                 self.NEST_DIR, self.SHELL_OUT_FD, self.SHELL_IN_FD),
-            ['qmlscene', '-I', self.ctrl.QML_MODULES_PATH, '--job',
-             self.job.qml_file, '--fd-out', self.SHELL_OUT_FD, '--fd-in',
-             self.SHELL_IN_FD, self.ctrl.QML_SHELL_PATH])
+            ['qmlscene', '-I', self.ctrl.QML_MODULES_PATH, self.job.qml_file,
+             self.SHELL_OUT_FD, self.SHELL_IN_FD, self.ctrl.QML_SHELL_PATH])
 
     @mock.patch('json.dumps')
     @mock.patch('os.path.isdir')