Import plainbox-provider-checkbox_0.61.0.orig.tar.gzupstream-0.61.0patched-0.61.0-1

5 files changed, 8 insertions, 7 deletions

diff --git a/units/bluetooth/jobs.pxu b/units/bluetooth/jobs.pxu
index e1573b5..7f3fb79 100644
--- a/units/bluetooth/jobs.pxu
+++ b/units/bluetooth/jobs.pxu
@@ -7,7 +7,7 @@ command:
 bt_list_adapters.py && udev_resource.py -f BLUETOOTH
 estimated_duration: 2s
 flags: preserve-locale
-requires: manifest.has_bt_adapter
+requires: manifest.has_bt_adapter == 'True'
 imports: from com.canonical.plainbox import manifest
 
 id: bluetooth/bluez-controller-detect
diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu
index 89565bf..244cca6 100644
--- a/units/ethernet/jobs.pxu
+++ b/units/ethernet/jobs.pxu
@@ -301,7 +301,8 @@ plugin: user-interact
 command:
 eth_hotplugging.py {{ interface }} && gateway_ping_test.py -v --interface {{ interface }}
 category_id: com.canonical.plainbox::ethernet
-estimated_duration: 1.0
+estimated_duration: 60.0
+user: root
 flags: preserve-locale
 
 unit: template
diff --git a/units/kernel-snap/test-plan.pxu b/units/kernel-snap/test-plan.pxu
index 585bd01..ffaa5d1 100644
--- a/units/kernel-snap/test-plan.pxu
+++ b/units/kernel-snap/test-plan.pxu
@@ -14,7 +14,6 @@ _name: Automated Kernel Snap tests
 _description: Automated Kernel Snap tests for Ubuntu Core devices
 include:
 kernel-snap/booted-kernel-matches-current-.*
- kernel-snap/booted-dtbs-match-current-.*
 bootstrap_include:
 bootloader
 
diff --git a/units/miscellanea/test-plan.pxu b/units/miscellanea/test-plan.pxu
index 1c7605a..a48e80f 100644
--- a/units/miscellanea/test-plan.pxu
+++ b/units/miscellanea/test-plan.pxu
@@ -67,6 +67,7 @@ mandatory_include:
 miscellanea/get_maas_version certification-status=blocker
 miscellanea/maas_user_check
 miscellanea/efi_boot_mode certification-status=blocker
+ miscellanea/secure_boot_mode
 miscellanea/reboot_firmware
 miscellanea/efi_pxeboot
 miscellanea/check_prerelease certification-status=blocker
diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu
index 060e0c6..deb16d4 100644
--- a/units/touchscreen/jobs.pxu
+++ b/units/touchscreen/jobs.pxu
@@ -141,7 +141,7 @@ _description:
 Validate that 3-touch tap is operating as expected
 STEPS:
 1. Commence the test
- {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
+ {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %}
 2. Tap the screen within the test area with 3 fingers simultaneously.
 3. Once 3 fingers are on the screen you should see the indicator they are recognized.
 VERIFICATION:
@@ -153,7 +153,7 @@ _description:
 Was the tap detected?
 {% endif %}
 command:
- {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
+ {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %}
 manage_compiz_plugin.py unityshell disable
 qmlscene -qt5 3 "$PLAINBOX_PROVIDER_DATA"/touch_tap_test.qml 2>&1 | grep -o PASS
 EXIT=$?
@@ -178,7 +178,7 @@ _description:
 Validate that 4-touch tap is operating as expected
 STEPS:
 1. Commence the test
- {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
+ {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %}
 2. Tap the screen within the test area with 4 fingers simultaneously.
 3. Once 4 fingers are on the screen you should see the indicator they are recognized.
 VERIFICATION:
@@ -188,7 +188,7 @@ _description:
 3. If the tap is not detected the test will time out after 20 seconds.
 {% endif %}
 command:
- {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
+ {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %}
 manage_compiz_plugin.py unityshell disable
 qmlscene -qt5 4 "$PLAINBOX_PROVIDER_DATA"/touch_tap_test.qml 2>&1 | grep -o PASS
 EXIT=$?