Create after-suspend manual usb type-C tests and related nested test plans

Fixes: lp:1732819 

2 files changed, 36 insertions, 8 deletions

diff --git a/units/usb/test-plan.pxu b/units/usb/test-plan.pxu
index 1ff40a6f..5b4e88b4 100644
--- a/units/usb/test-plan.pxu
+++ b/units/usb/test-plan.pxu
@@ -50,6 +50,20 @@ include:
 suspend/usb3_storage_automated_after_suspend certification-status=blocker
 suspend/usb3_remove_after_suspend certification-status=blocker
 
+id: after-suspend-usb-c-cert-full
+unit: test plan
+_name: USB Type-C tests (after suspend)
+_description: USB Type-C tests (after suspend)
+include:
+ after-suspend-manual-usb-c/c-to-a-adapter/hid certification-status=blocker
+ after-suspend-manual-usb-c/c-to-a-adapter/insert certification-status=blocker
+ after-suspend-manual-usb-c/c-to-a-adapter/storage-automated certification-status=blocker
+ after-suspend-manual-usb-c/c-to-a-adapter/remove certification-status=blocker
+ after-suspend-manual-usb-c/hid certification-status=blocker
+ after-suspend-manual-usb-c/insert certification-status=blocker
+ after-suspend-manual-usb-c/storage-automated certification-status=blocker
+ after-suspend-manual-usb-c/remove certification-status=blocker
+
 id: usb-cert-blockers
 unit: test plan
 _name: USB tests (certification blockers only)
@@ -102,6 +116,20 @@ include:
 suspend/usb3_storage_automated_after_suspend certification-status=blocker
 suspend/usb3_remove_after_suspend certification-status=blocker
 
+id: after-suspend-usb-c-cert-blockers
+unit: test plan
+_name: USB Type-C tests (after suspend, certification blockers only)
+_description: USB Type-C tests (after suspend, certification blockers only)
+include:
+ after-suspend-manual-usb-c/c-to-a-adapter/hid certification-status=blocker
+ after-suspend-manual-usb-c/c-to-a-adapter/insert certification-status=blocker
+ after-suspend-manual-usb-c/c-to-a-adapter/storage-automated certification-status=blocker
+ after-suspend-manual-usb-c/c-to-a-adapter/remove certification-status=blocker
+ after-suspend-manual-usb-c/hid certification-status=blocker
+ after-suspend-manual-usb-c/insert certification-status=blocker
+ after-suspend-manual-usb-c/storage-automated certification-status=blocker
+ after-suspend-manual-usb-c/remove certification-status=blocker
+
 id: usb-preinserted
 unit: test plan
 _name: Automated USB write/read/compare tests on storage devices
diff --git a/units/usb/usb-c.pxu b/units/usb/usb-c.pxu
index 9a776643..d2004c27 100644
--- a/units/usb/usb-c.pxu
+++ b/units/usb/usb-c.pxu
@@ -10,7 +10,7 @@ _steps:
 _verification:
 Did the device work as expected?
 plugin: manual
-flags: also-after-suspend
+flags: also-after-suspend-manual
 category_id: com.canonical.plainbox::usb
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_usb_type_c == 'True'
@@ -30,7 +30,7 @@ _verification:
 The verification of this test is automated. Do not change the
 automatically selected result.
 plugin: user-interact
-flags: also-after-suspend
+flags: also-after-suspend-manual
 user: root
 command:
 if [[ -v SNAP ]]; then
@@ -50,7 +50,7 @@ _description:
 This test is automated and executes after the usb-c/c-to-a-adapter/insert test
 is run.
 plugin: shell
-flags: also-after-suspend
+flags: also-after-suspend-manual
 user: root
 command:
 if [[ -v SNAP ]]; then
@@ -78,7 +78,7 @@ _verification:
 The verification of this test is automated. Do not change the
 automatically selected result.
 plugin: user-interact
-flags: also-after-suspend
+flags: also-after-suspend-manual
 user: root
 command:
 if [[ -v SNAP ]]; then
@@ -105,7 +105,7 @@ _steps:
 _verification:
 Did the device work as expected?
 plugin: manual
-flags: also-after-suspend
+flags: also-after-suspend-manual
 category_id: com.canonical.plainbox::usb
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_usb_type_c == 'True'
@@ -124,7 +124,7 @@ _verification:
 The verification of this test is automated. Do not change the
 automatically selected result.
 plugin: user-interact
-flags: also-after-suspend
+flags: also-after-suspend-manual
 user: root
 command:
 if [[ -v SNAP ]]; then
@@ -145,7 +145,7 @@ _description:
 This test is automated and executes after the usb-c/insert test
 is run.
 plugin: shell
-flags: also-after-suspend
+flags: also-after-suspend-manual
 user: root
 command:
 if [[ -v SNAP ]]; then
@@ -172,7 +172,7 @@ _verification:
 The verification of this test is automated. Do not change the
 automatically selected result.
 plugin: user-interact
-flags: also-after-suspend
+flags: also-after-suspend-manual
 user: root
 command:
 if [[ -v SNAP ]]; then