Merge #384164 from ~ray.chen/plainbox-provider-checkbox:lp1811948-add-rotation-after-s3

suspend-graphics: add rotation after suspend test and add new case into graphic test plan. lp: #1811948 

2 files changed, 39 insertions, 8 deletions

diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index 1907209..16ca11c 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -37,7 +37,7 @@ include:
 graphics/xorg-process certification-status=blocker
 graphics/VESA_drivers_not_in_use certification-status=blocker
 graphics/1_driver_version_.* certification-status=blocker
- graphics/1_gl_support_.* certification-status=blocker
+ graphics/1_gl_support_.* certification-status=blocker
 graphics/1_minimum_resolution_.*
 suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
 bootstrap_include:
@@ -79,7 +79,7 @@ include:
 graphics/2_auto_switch_card_.* certification-status=blocker
 graphics/2_valid_opengl_renderer_.* certification-status=blocker
 graphics/2_driver_version_.* certification-status=blocker
- graphics/2_gl_support_.* certification-status=blocker
+ graphics/2_gl_support_.* certification-status=blocker
 graphics/2_minimum_resolution_.*
 suspend/2_resolution_before_suspend_.*_auto certification-status=blocker
 bootstrap_include:
@@ -107,7 +107,7 @@ include:
 # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs)
 suspend/1_suspend-time-check_.*_auto certification-status=non-blocker
 suspend/1_suspend-single-log-attach_.*_auto certification-status=non-blocker
- suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
+ suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/1_resolution_after_suspend_.*_auto certification-status=blocker
 
@@ -125,6 +125,7 @@ include:
 power-management/lid_open certification-status=blocker
 suspend/1_display_after_suspend_.*_graphics certification-status=blocker
 suspend/1_glxgears_after_suspend_.*_graphics certification-status=blocker
+ suspend/1_rotation_after_suspend_.*_graphics certification-status=blocker
 suspend/1_video_after_suspend_.*_graphics certification-status=blocker
 suspend/1_cycle_resolutions_after_suspend_.*_graphics certification-status=non-blocker
 suspend/1_xrandr_screens_after_suspend.tar.gz_auto
@@ -146,7 +147,7 @@ include:
 suspend/2_suspend_after_switch_to_card_.*_auto certification-status=blocker
 suspend/2_suspend-time-check_.*_auto certification-status=non-blocker
 suspend/2_suspend-single-log-attach_.*_auto certification-status=non-blocker
- suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
+ suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/2_resolution_after_suspend_.*_auto certification-status=blocker
 
@@ -157,6 +158,7 @@ _description: After suspend tests (discrete GPU manual)
 include:
 suspend/2_display_after_suspend_.*_graphics certification-status=blocker
 suspend/2_glxgears_after_suspend_.*_graphics certification-status=blocker
+ suspend/2_rotation_after_suspend_.*_graphics certification-status=blocker
 suspend/2_video_after_suspend_.*_graphics certification-status=blocker
 suspend/2_cycle_resolutions_after_suspend_.*_graphics certification-status=non-blocker
 suspend/2_xrandr_screens_after_suspend_.*.tar.gz_auto
@@ -174,7 +176,7 @@ include:
 graphics/1_maximum_resolution_.* certification-status=blocker
 graphics/1_glxgears_.* certification-status=blocker
 graphics/1_driver_version_.* certification-status=blocker
- graphics/1_gl_support_.* certification-status=blocker
+ graphics/1_gl_support_.* certification-status=blocker
 graphics/1_rotation_.* certification-status=blocker
 graphics/1_video_.* certification-status=blocker
 suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
@@ -191,7 +193,7 @@ include:
 graphics/2_valid_opengl_renderer_.* certification-status=blocker
 graphics/2_glxgears_.* certification-status=blocker
 graphics/2_driver_version_.* certification-status=blocker
- graphics/2_gl_support_.* certification-status=blocker
+ graphics/2_gl_support_.* certification-status=blocker
 graphics/2_rotation_.* certification-status=blocker
 graphics/2_video_.* certification-status=blocker
 bootstrap_include:
@@ -207,11 +209,12 @@ include:
 power-management/lid certification-status=blocker
 power-management/lid_close certification-status=blocker
 power-management/lid_open certification-status=blocker
- suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
+ suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/1_resolution_after_suspend_.*_auto certification-status=blocker
 suspend/1_display_after_suspend_.*_graphics certification-status=blocker
 suspend/1_glxgears_after_suspend_.*_graphics certification-status=blocker
+ suspend/1_rotation_after_suspend_.*_graphics certification-status=blocker 
 suspend/1_video_after_suspend_.*_graphics certification-status=blocker
 
 id: after-suspend-graphics-discrete-gpu-cert-blockers
@@ -221,9 +224,10 @@ _description: After suspend tests (discrete GPU, certification blockers only)
 include:
 suspend/2_resolution_before_suspend_.*_auto certification-status=blocker
 suspend/2_suspend_after_switch_to_card_.*_graphics certification-status=blocker
- suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
+ suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/2_resolution_after_suspend_.*_auto certification-status=blocker
 suspend/2_display_after_suspend_.*_graphics certification-status=blocker
 suspend/2_glxgears_after_suspend_.*_graphics certification-status=blocker
+ suspend/2_rotation_after_suspend_.*_graphics certification-status=blocker
 suspend/2_video_after_suspend_.*_graphics certification-status=blocker
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index 21effcc..b0a8608 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -262,3 +262,30 @@ command:
 fi
 _purpose:
 Suspend SUT 30 times while using {product_slug} graphics card
+ 
+unit: template
+template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
+template-engine: jinja2
+plugin: user-interact-verify
+category_id: com.canonical.plainbox::suspend
+id: suspend/{{ index }}_rotation_after_suspend_{{ product_slug }}_graphics
+depends:
+ {%- if gpu_count > "1" %}
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
+ {%- else %}
+ suspend/suspend_advanced
+ {%- endif %}
+command:
+ source graphics_env {{ driver }} {{ index }}
+ rotation_test
+estimated_duration: 20.000
+_summary: Test rotation for {{ vendor }} {{ product }} after suspend
+_description:
+ PURPOSE:
+ This test will test display rotation on the {{ vendor }} {{ product }} graphics card after suspend
+ STEPS:
+ 1. Click "Test" to test display rotation. The display will be rotated every 4 seconds.
+ 2. Check if all rotations (normal right inverted left) took place without permanent screen corruption
+ VERIFICATION:
+ Did the display rotation take place without permanent screen corruption after suspend?