Add after suspend thunderbolt/thunderbolt3 test cases

Add sibling job and suspend/suspend_advanced for after suspend thunderbolt/thunderbolt3 test cases to test plan LP: #1831559 

2 files changed, 63 insertions, 0 deletions

diff --git a/units/thunderbolt/jobs.pxu b/units/thunderbolt/jobs.pxu
index 14fa3f8..74481fe 100644
--- a/units/thunderbolt/jobs.pxu
+++ b/units/thunderbolt/jobs.pxu
@@ -5,6 +5,11 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt == 'True'
 estimated_duration: 20.0
 command: removable_storage_watcher insert --timeout 40 scsi
+_siblings: [
+ { "id": "after-suspend-manual-thunderbolt/insert",
+ "_summary": "thunderbolt/insert after suspend",
+ "depends": "suspend/suspend_advanced"}
+ ]
 _summary: Storage insert detection on Thunderbolt
 _description:
 PURPOSE:
@@ -27,6 +32,11 @@ requires: manifest.has_thunderbolt == 'True'
 depends: thunderbolt/insert
 estimated_duration: 45.0
 command: removable_storage_test -s 268400000 scsi
+_siblings: [
+ { "id": "after-suspend-manual-thunderbolt/storage-test",
+ "_summary": "thunderbolt/storage-test after suspend",
+ "depends": "after-suspend-manual-thunderbolt/insert"}
+ ]
 _summary: Storage test on Thunderbolt
 _description:
 This is an automated test which performs read/write operations on an attached
@@ -41,6 +51,11 @@ depends: thunderbolt/insert
 estimated_duration: 10.0
 command: removable_storage_watcher remove scsi
 _summary: Storage removal detection on Thunderbolt
+_siblings: [
+ { "id": "after-suspend-manual-thunderbolt/remove",
+ "_summary": "thunderbolt/remove after suspend",
+ "depends": "after-suspend-manual-thunderbolt/insert"}
+ ]
 _description:
 PURPOSE:
 This test will check the system can detect the removal of a Thunderbolt HDD
@@ -82,6 +97,11 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 estimated_duration: 20.0
 command: removable_storage_watcher insert --timeout 40 scsi
+_siblings: [
+ { "id": "after-suspend-manual-thunderbolt3/insert",
+ "_summary": "thunderbolt3/insert after suspend",
+ "depends": "suspend/suspend_advanced"}
+ ]
 _summary: Storage insert detection on Thunderbolt 3 port
 _description:
 PURPOSE:
@@ -104,6 +124,11 @@ requires: manifest.has_thunderbolt3 == 'True'
 depends: thunderbolt3/insert
 estimated_duration: 45.0
 command: removable_storage_test -s 268400000 scsi
+_siblings: [
+ { "id": "after-suspend-manual-thunderbolt3/storage-test",
+ "_summary": "thunderbolt3/storage-test after suspend",
+ "depends": "after-suspend-manual-thunderbolt3/insert"}
+ ]
 _summary: Storage test on Thunderbolt 3
 _description:
 This is an automated test which performs read/write operations on an attached
@@ -117,6 +142,11 @@ requires: manifest.has_thunderbolt3 == 'True'
 depends: thunderbolt3/insert
 estimated_duration: 10.0
 command: removable_storage_watcher remove scsi
+_siblings: [
+ { "id": "after-suspend-manual-thunderbolt3/remove",
+ "_summary": "thunderbolt3/remove after suspend",
+ "depends": "after-suspend-manual-thunderbolt3/insert"}
+ ]
 _summary: Storage removal detection on Thunderbolt 3 port
 _description:
 PURPOSE:
diff --git a/units/thunderbolt/test-plan.pxu b/units/thunderbolt/test-plan.pxu
index a0efcda..f80a0ad 100644
--- a/units/thunderbolt/test-plan.pxu
+++ b/units/thunderbolt/test-plan.pxu
@@ -8,6 +8,15 @@ nested_part:
 com.canonical.certification::thunderbolt-cert-manual
 com.canonical.certification::thunderbolt-cert-automated
 
+id: after-suspend-thunderbolt-cert-full
+unit: test plan
+_name: Thunderbolt tests
+_description:
+ Thunderbolt tests
+include:
+nested_part:
+ com.canonical.certification::after-suspend-thunderbolt-cert
+
 id: thunderbolt-cert-manual
 unit: test plan
 _name: Thunderbolt tests (Manual)
@@ -37,3 +46,27 @@ include:
 thunderbolt3/insert certification-status=blocker
 thunderbolt3/storage-test certification-status=blocker
 thunderbolt3/remove certification-status=blocker
+
+id: after-suspend-thunderbolt-cert
+unit: test plan
+_name: Thunderbolt tests (after suspend Manual)
+_description:
+ Thunderbolt tests (after suspend Manual)
+include:
+ after-suspend-manual-thunderbolt/insert certification-status=non-blocker
+ after-suspend-manual-thunderbolt/storage-test certification-status=non-blocker
+ after-suspend-manual-thunderbolt/remove certification-status=non-blocker
+ after-suspend-manual-thunderbolt3/insert certification-status=blocker
+ after-suspend-manual-thunderbolt3/storage-test certification-status=blocker
+ after-suspend-manual-thunderbolt3/remove certification-status=blocker
+
+id: after-suspend-thunderbolt-cert-blockers
+unit: test plan
+_name: Thunderbolt tests (after suspend - certification blockers only)
+_description: Thunderbolt tests (after suspend - certification blockers only)
+include:
+ after-suspend-manual-thunderbolt3/insert certification-status=blocker
+ after-suspend-manual-thunderbolt3/storage-test certification-status=blocker
+ after-suspend-manual-thunderbolt3/remove certification-status=blocker
+
+