Merge #367593 from ~jocave/plainbox-provider-checkbox:lp1811933

2 files changed, 45 insertions, 2 deletions

diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu
index 225c168..de55c5d 100644
--- a/units/touchscreen/jobs.pxu
+++ b/units/touchscreen/jobs.pxu
@@ -59,6 +59,7 @@ _description:
 2. Drag and drop the object in a different location
 VERIFICATION:
 Does drag and drop work?
+flags: also-after-suspend-manual
 
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::touchscreen
@@ -76,6 +77,7 @@ _description:
 2. Using 2 fingers, resize the blue square until it turns green, then release it.
 VERIFICATION:
 Did the blue square change size following the gesture?
+flags: also-after-suspend-manual
 
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::touchscreen
@@ -93,6 +95,7 @@ _description:
 2. Using 2 fingers, rotate the blue square until it turns green, then release it.
 VERIFICATION:
 Did the blue square rotate following the gesture?
+flags: also-after-suspend-manual
 
 plugin: manual
 category_id: com.canonical.plainbox::touchscreen
@@ -158,6 +161,7 @@ command:
 EXIT=$?
 {% endif %}
 exit $EXIT
+flags: also-after-suspend-manual
 
 plugin: user-interact-verify
 template-engine: jinja2
@@ -192,3 +196,4 @@ command:
 EXIT=$?
 {% endif %}
 exit $EXIT
+flags: also-after-suspend-manual
diff --git a/units/touchscreen/test-plan.pxu b/units/touchscreen/test-plan.pxu
index 2ec59e5..6d51cb7 100644
--- a/units/touchscreen/test-plan.pxu
+++ b/units/touchscreen/test-plan.pxu
@@ -5,8 +5,8 @@ _description:
 Touchscreen tests
 include:
 nested_part:
- com.canonical.certification::touchscreen-cert-manual
- com.canonical.certification::touchscreen-cert-automated
+ touchscreen-cert-manual
+ touchscreen-cert-automated
 
 id: touchscreen-cert-manual
 unit: test plan
@@ -27,6 +27,34 @@ _description:
 Touchscreen tests (Automated)
 include:
 
+id: after-suspend-cert-full
+unit: test plan
+_name: Touchscreen tests
+_description:
+ Touchscreen tests
+include:
+nested_part:
+ after-suspend-touchscreen-cert-manual
+ after-suspend-touchscreen-cert-automated
+
+id: after-suspend-touchscreen-cert-manual
+unit: test plan
+_name: Touchscreen tests (Manual)
+_description:
+ Touchscreen tests (Manual)
+include:
+ after-suspend-manual-touchscreen/drag-n-drop certification-status=blocker
+ after-suspend-manual-touchscreen/multitouch-zoom certification-status=blocker
+ after-suspend-manual-touchscreen/multitouch-rotate
+ after-suspend-manual-touchscreen/3-touch-tap certification-status=blocker
+ after-suspend-manual-touchscreen/4-touch-tap certification-status=blocker
+
+id: after-suspend-touchscreen-cert-automated
+unit: test plan
+_name: Touchscreen tests (Automated)
+_description:
+ Touchscreen tests (Automated)
+include:
 
 id: touchscreen-cert-blockers
 unit: test plan
@@ -37,3 +65,13 @@ include:
 touchscreen/multitouch-zoom certification-status=blocker
 touchscreen/3-touch-tap certification-status=blocker
 touchscreen/4-touch-tap certification-status=blocker
+
+id: after-suspend-touchscreen-cert-blockers
+unit: test plan
+_name: Touchscreen tests (after suspend, certification blockers only)
+_description: Touchscreen tests (after suspend, certification blockers only)
+include:
+ after-suspend-manual-touchscreen/drag-n-drop certification-status=blocker
+ after-suspend-manual-touchscreen/multitouch-zoom certification-status=blocker
+ after-suspend-manual-touchscreen/3-touch-tap certification-status=blocker
+ after-suspend-manual-touchscreen/4-touch-tap certification-status=blocker