Import plainbox-provider-checkbox_0.62.0~rc1.orig.tar.gzupstream-0.62.0_rc1patched-0.62.0_rc1-1

3 files changed, 29 insertions, 59 deletions

diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index 95ddf31..05349b8 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -25,7 +25,7 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 6
 _description:
 Check system can find a wireless network AP nearby
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 {%- if __on_ubuntucore__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -48,7 +48,7 @@ command:
 wifi_nmcli_test.py secured {{ interface }} "$WPA_BG_SSID" "$WPA_BG_PSK"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 {%- if __on_ubuntucore__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -71,7 +71,7 @@ command:
 wifi_nmcli_test.py open {{ interface }} "$OPEN_BG_SSID"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 {%- if __on_ubuntucore__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -94,7 +94,7 @@ command:
 wifi_nmcli_test.py secured {{ interface }} "$WPA_N_SSID" "$WPA_N_PSK"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 {%- if __on_ubuntucore__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -117,7 +117,7 @@ command:
 wifi_nmcli_test.py open {{ interface }} "$OPEN_N_SSID"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 {%- if __on_ubuntucore__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -140,7 +140,7 @@ command:
 wifi_nmcli_test.py secured {{ interface }} "$WPA_AC_SSID" "$WPA_AC_PSK"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
 {%- if __on_ubuntucore__ %}
@@ -164,7 +164,7 @@ command:
 wifi_nmcli_test.py open {{ interface }} "$OPEN_AC_SSID"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
 {%- if __on_ubuntucore__ %}
@@ -188,7 +188,7 @@ command:
 wifi_nmcli_test.py secured {{ interface }} "$WPA_AX_SSID" "$WPA_AX_PSK"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ax == 'supported'
 {%- if __on_ubuntucore__ %}
@@ -212,7 +212,7 @@ command:
 wifi_nmcli_test.py open {{ interface }} "$OPEN_AX_SSID"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ax == 'supported'
 {%- if __on_ubuntucore__ %}
@@ -536,7 +536,7 @@ user: root
 command:
 wifi_nmcli_backup.py save
 estimated_duration: 2.0
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
@@ -550,16 +550,4 @@ command:
 wifi_nmcli_backup.py restore
 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 d0458cc..91fb07e 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -21,7 +21,7 @@ _name: Wireless tests (after suspend)
 _description: Wireless connection tests (after suspend)
 include:
 nested_part:
- after-suspend-manual-wireless-cert-automated
+ after-suspend-wireless-cert-automated
 
 id: wireless-cert-automated
 unit: test plan
@@ -62,24 +62,6 @@ include:
 after-suspend-wireless/nm_connection_restore_.*
 after-suspend-wireless/check_iwlwifi_microcode_crash_.*
 
-id: after-suspend-manual-wireless-cert-automated
-unit: test plan
-_name: Wireless tests (after manual suspend, automated)
-_description: Wireless connection tests (after manual suspend, automated)
-bootstrap_include:
- device
-include:
- after-suspend-manual-wireless/nm_connection_save_.*
- after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
- after-suspend-manual-wireless/nm_connection_restore_.*
-
 id: wireless-cert-blockers
 unit: test plan
 _name: Wireless tests (certification blockers only)
@@ -107,16 +89,16 @@ _description:
 bootstrap_include:
 device
 include:
- after-suspend-manual-wireless/nm_connection_save_.*
- after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
- after-suspend-manual-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
- after-suspend-manual-wireless/nm_connection_restore_.*
+ after-suspend-wireless/nm_connection_save_.*
+ after-suspend-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+ 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_.*
 
 id: wireless-full
 unit: test plan
diff --git a/units/wireless/wireless-connection-netplan.pxu b/units/wireless/wireless-connection-netplan.pxu
index 44677e2..12b29d8 100644
--- a/units/wireless/wireless-connection-netplan.pxu
+++ b/units/wireless/wireless-connection-netplan.pxu
@@ -16,7 +16,7 @@ user: root
 environ: LD_LIBRARY_PATH OPEN_AX_SSID NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ax == 'supported'
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
@@ -40,7 +40,7 @@ user: root
 environ: LD_LIBRARY_PATH OPEN_AC_SSID NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
@@ -65,7 +65,7 @@ user: root
 environ: LD_LIBRARY_PATH OPEN_BG_SSID NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
 
@@ -88,7 +88,7 @@ user: root
 environ: LD_LIBRARY_PATH OPEN_N_SSID NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
 
@@ -111,7 +111,7 @@ user: root
 environ: LD_LIBRARY_PATH WPA_AX_SSID WPA_AX_PSK NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ax == 'supported'
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
@@ -135,7 +135,7 @@ user: root
 environ: LD_LIBRARY_PATH WPA_AC_SSID WPA_AC_PSK NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
@@ -159,7 +159,7 @@ user: root
 environ: LD_LIBRARY_PATH WPA_BG_SSID WPA_BG_PSK NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
 
@@ -182,6 +182,6 @@ user: root
 environ: LD_LIBRARY_PATH WPA_N_SSID WPA_N_PSK NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
-flags: preserve-locale also-after-suspend also-after-suspend-manual
+flags: preserve-locale also-after-suspend
 requires:
 net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'