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

[Sylvain Pineau]

Fixes linked bug.

Makes the call to manage_compiz_plugin only effective on 16.04
Fix qmlscene invocation to work on 16.04 and 18.04 where args have to be placed first.

Tested on 16.04 and 18.04

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

[Jonathan Cave (jocave)]

+1 nice use of the jinja2 again

review: Approve

diff --git a/data/touch_tap_test.qml b/data/touch_tap_test.qml
index c56c930..fc2c61d 100644
--- a/data/touch_tap_test.qml
+++ b/data/touch_tap_test.qml
@@ -13,7 +13,7 @@ Rectangle {
         color: "white"
         font.pointSize: 15
         property var timeout: 15
-        text: "<p>Touch the screen with "+Qt.application.arguments[2]+" fingers at the same time</p>" +
+        text: "<p>Touch the screen with "+Qt.application.arguments[1]+" fingers at the same time</p>" +
         "<p>Press ESC to cancel the test at any time.</p>" +
         "<p><b>Test will exit automatically in " +
         timeout + " seconds </b></p>"
@@ -72,7 +72,7 @@ Rectangle {
         enabled: true
         anchors.fill: parent
 
-        minimumTouchPoints: Qt.application.arguments[2]
+        minimumTouchPoints: Qt.application.arguments[1]
         maximumTouchPoints: minimumTouchPoints
 
         onReleased: {
diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu
index 9db5677..98a2d4f 100644
--- a/units/touchscreen/jobs.pxu
+++ b/units/touchscreen/jobs.pxu
@@ -124,6 +124,7 @@ _description:
      Did the tap open the Dash?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::touchscreen
 id: touchscreen/3-touch-tap
 imports: from com.canonical.plainbox import manifest
@@ -139,14 +140,19 @@ _description:
  VERIFICATION:
      Did you see the green circles around the three fingers?
 command:
+    {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
     manage_compiz_plugin unityshell disable
-    qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 3 2>&1 | grep -o PASS
+    {% endif %}
+    qmlscene -qt5 3 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS
     EXIT=$?
     sleep 5
+    {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
     manage_compiz_plugin unityshell enable
+    {% endif %}
     exit $EXIT
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::touchscreen
 id: touchscreen/4-touch-tap
 imports: from com.canonical.plainbox import manifest
@@ -162,9 +168,13 @@ _description:
  VERIFICATION:
      Did you see the green circles around the four fingers?
 command:
+    {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
     manage_compiz_plugin unityshell disable
-    qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 4 2>&1 | grep -o PASS
+    {% endif %}
+    qmlscene -qt5 4 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS
     EXIT=$?
     sleep 5
+    {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
     manage_compiz_plugin unityshell enable
+    {% endif %}
     exit $EXIT