Import plainbox-provider-checkbox_0.60.0~rc1.orig.tar.gzupstream-0.60.0_rc1patched-0.60.0_rc1-1

2 files changed, 16 insertions, 3 deletions

diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index 4827af1..95ddf31 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -551,3 +551,15 @@ command:
 estimated_duration: 2.0
 depends: wireless/nm_connection_save_{interface}
 flags: preserve-locale also-after-suspend also-after-suspend-manual
+
+unit: template
+template-resource: device
+template-filter: device.driver == 'iwlwifi'
+id: wireless/check_iwlwifi_microcode_crash_{interface}
+_summary: Check there have been no iwlwifi crashes
+plugin: shell
+command: check-iwlwifi-microcode-sw-error.sh
+category_id: com.canonical.plainbox::wireless
+estimated_duration: 30.0
+flags: preserve-locale also-after-suspend
+requires: package.name == 'systemd'
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index b7448cb..d0458cc 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -14,9 +14,6 @@ _name: Wireless tests (Manual)
 _description:
 Wireless connection tests (Manual)
 include:
-nested_part:
- wireless-cert-automated
-
 
 id: after-suspend-wireless-cert-full
 unit: test plan
@@ -44,6 +41,7 @@ include:
 wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
 wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
 wireless/nm_connection_restore_.*
+ wireless/check_iwlwifi_microcode_crash_.*
 
 id: after-suspend-wireless-cert-automated
 unit: test plan
@@ -62,6 +60,7 @@ include:
 after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
 after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
 after-suspend-wireless/nm_connection_restore_.*
+ after-suspend-wireless/check_iwlwifi_microcode_crash_.*
 
 id: after-suspend-manual-wireless-cert-automated
 unit: test plan
@@ -160,6 +159,7 @@ include:
 wireless/wireless_connection_wpa_ac_np_.*
 wireless/wireless_connection_wpa_bg_np_.*
 wireless/wireless_connection_wpa_n_np_.*
+ wireless/check_iwlwifi_microcode_crash_.*
 bootstrap_include:
 device
 
@@ -357,6 +357,7 @@ include:
 after-suspend-wireless/wireless_connection_wpa_ac_np_.*
 after-suspend-wireless/wireless_connection_wpa_bg_np_.*
 after-suspend-wireless/wireless_connection_wpa_n_np_.*
+ after-suspend-wireless/check_iwlwifi_microcode_crash_.*
 bootstrap_include:
 device