Merge #391102 from ~bettyl/plainbox-provider-checkbox:update_depends_to_suspend_advanced_autosnap-2020-09-24T0652

 To let the test plan 'after-suspend-reference-cert-automated' and 'after-suspend-reference-cert-blockers' can run fully auto. 

2 files changed, 48 insertions, 14 deletions

diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 9a9ced6..034f97b 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -411,6 +411,14 @@ command: network_wait.sh; gateway_ping_test.py | diff "$PLAINBOX_SESSION_SHARE"/
 
 plugin: shell
 category_id: com.canonical.plainbox::suspend
+id: suspend/network_after_suspend_auto
+estimated_duration: 20.0
+depends: suspend/suspend_advanced_auto suspend/network_before_suspend
+_description: Test the network after resuming.
+command: network_wait.sh; gateway_ping_test.py | diff "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt -
+
+plugin: shell
+category_id: com.canonical.plainbox::suspend
 id: suspend/resolution_after_suspend
 depends: suspend/suspend_advanced suspend/resolution_before_suspend
 estimated_duration: 1.2
@@ -949,6 +957,32 @@ _description:
 
 plugin: shell
 category_id: com.canonical.plainbox::suspend
+id: suspend/bluetooth_detect_after_suspend_auto
+depends: suspend/suspend_advanced_auto bluetooth/detect-output
+estimated_duration: 1.2
+requires:
+ package.name == 'bluez'
+ device.category == 'BLUETOOTH'
+command:
+ if rfkill list bluetooth | grep -q 'Hard blocked: yes'; then
+ echo "rfkill shows BT is hard blocked"
+ fi
+ if rfkill list bluetooth | grep -q 'Soft blocked: yes'; then
+ echo "rfkill shows BT is soft blocked, removing before testing"
+ rfkill unblock bluetooth
+ sleep 3
+ fi
+ output=$(hcitool dev | tail -n+2 | awk '{print $2}')
+ echo "$output" | diff "$PLAINBOX_SESSION_SHARE"/bluetooth_address -
+ if [ -z "$output" ]; then
+ echo "BT hardware not available"
+ exit 1
+ fi
+_description:
+ This test grabs the hardware address of the bluetooth adapter after suspend and compares it to the address grabbed before suspend.
+
+plugin: shell
+category_id: com.canonical.plainbox::suspend
 id: suspend/bluetooth_obex_send_after_suspend
 depends: suspend/suspend_advanced
 estimated_duration: 10.0
diff --git a/units/suspend/test-plan.pxu b/units/suspend/test-plan.pxu
index 4bc26bf..66b38a2 100644
--- a/units/suspend/test-plan.pxu
+++ b/units/suspend/test-plan.pxu
@@ -44,13 +44,13 @@ unit: test plan
 _name: After suspend reference tests (automated)
 _description: After suspend reference tests (automated)
 include:
- suspend/network_after_suspend certification-status=blocker
- suspend/audio_after_suspend certification-status=blocker
- suspend/cpu_after_suspend certification-status=blocker
- suspend/memory_after_suspend certification-status=blocker
- suspend/bluetooth_detect_after_suspend certification-status=blocker
- suspend/bluetooth_obex_send_after_suspend certification-status=blocker
- after-suspend-manual-bluetooth4/beacon_eddystone_url_.* certification-status=blocker
+ suspend/network_after_suspend_auto certification-status=blocker
+ suspend/audio_after_suspend_auto certification-status=blocker
+ suspend/cpu_after_suspend_auto certification-status=blocker
+ suspend/memory_after_suspend_auto certification-status=blocker
+ suspend/bluetooth_detect_after_suspend_auto certification-status=blocker
+ suspend/bluetooth_obex_send_after_suspend_auto certification-status=blocker
+ after-suspend-bluetooth4/beacon_eddystone_url_.* certification-status=blocker
 bootstrap_include:
 device
 
@@ -73,13 +73,13 @@ unit: test plan
 _name: After suspend reference tests (certification blockers only)
 _description: After suspend reference tests (certification blockers only)
 include:
- suspend/network_after_suspend certification-status=blocker
- suspend/audio_after_suspend certification-status=blocker
- suspend/cpu_after_suspend certification-status=blocker
- suspend/memory_after_suspend certification-status=blocker
- suspend/bluetooth_detect_after_suspend certification-status=blocker
- suspend/bluetooth_obex_send_after_suspend certification-status=blocker
- after-suspend-manual-bluetooth4/beacon_eddystone_url_.* certification-status=blocker
+ suspend/network_after_suspend_auto certification-status=blocker
+ suspend/audio_after_suspend_auto certification-status=blocker
+ suspend/cpu_after_suspend_auto certification-status=blocker
+ suspend/memory_after_suspend_auto certification-status=blocker
+ suspend/bluetooth_detect_after_suspend_auto certification-status=blocker
+ suspend/bluetooth_obex_send_after_suspend_auto certification-status=blocker
+ after-suspend-bluetooth4/beacon_eddystone_url_.* certification-status=blocker
 bootstrap_include:
 device