diff options
| -rwxr-xr-x | bin/disk_stress_ng | 2 | ||||
| -rwxr-xr-x | bin/pm_test | 4 | ||||
| -rw-r--r-- | data/touch_tap_test.qml | 4 | ||||
| -rwxr-xr-x | manage.py | 2 | ||||
| -rw-r--r-- | units/cpu/jobs.pxu | 1 | ||||
| -rw-r--r-- | units/touchscreen/jobs.pxu | 14 |
6 files changed, 19 insertions, 8 deletions
diff --git a/bin/disk_stress_ng b/bin/disk_stress_ng index 3668f63..27db58f 100755 --- a/bin/disk_stress_ng +++ b/bin/disk_stress_ng @@ -103,7 +103,7 @@ find_largest_partition() { largest_size=0 mapper_string="dm-" if [ "${disk_device#*$mapper_string}" = "$disk_device" ]; then - partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device | grep -E 'part|lvm' | tr -s " ") + partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device | grep -E 'part|lvm|raid' | tr -s " ") else partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device) fi diff --git a/bin/pm_test b/bin/pm_test index c555ab5..d1bd3b1 100755 --- a/bin/pm_test +++ b/bin/pm_test @@ -206,8 +206,8 @@ class PowerManagementOperation(): MessageDialog(title, message).run() if self.args.checkbox_respawn_cmd: subprocess.run( - 'DISPLAY=:0 x-terminal-emulator -e "sudo -u ' - '{} bash -c \"source {}; exec bash\""'.format( + r'DISPLAY=:0 x-terminal-emulator -e "sudo -u ' + r'{} bash -c \"source {}; exec bash\""'.format( self.user, self.args.checkbox_respawn_cmd), shell=True) def teardown(self): 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: { @@ -5,7 +5,7 @@ from plainbox.provider_manager import N_ setup( name='plainbox-provider-checkbox', namespace='com.canonical.certification', - version="0.44.0", + version="0.45.0rc1", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu index bf23af7..db0dd8f 100644 --- a/units/cpu/jobs.pxu +++ b/units/cpu/jobs.pxu @@ -77,6 +77,7 @@ _summary: Test offlining of each CPU core _description: Attempts to offline each core in a multicore system. +requires: cpuinfo.platform not in ("aarch64", "armhf") plugin: shell category_id: com.canonical.plainbox::cpu 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 |