monitor: add type-c tests and after-suspend TP for discrete-gpu

1 files changed, 48 insertions, 8 deletions

diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu
index d18fcbf..c70b03a 100644
--- a/units/monitor/test-plan.pxu
+++ b/units/monitor/test-plan.pxu
@@ -30,10 +30,9 @@ include:
 audio/1_playback_displayport_.* certification-status=blocker
 monitor/1_type-c_displayport_.* certification-status=blocker
 audio/1_playback_type-c_displayport_.* certification-status=blocker
- monitor/type-c-to-hdmi certification-status=blocker
- # placeholder for monitor/1_type-c_hdmi_.*
+ monitor/1_type-c_hdmi_.* certification-status=blocker
 audio/1_playback_type-c_hdmi_.* certification-status=blocker
- monitor/type-c-to-vga certification-status=blocker
+ monitor/1_type-c_vga_.* certification-status=blocker
 monitor/1_dvi_.* certification-status=blocker
 monitor/1_hdmi_.* certification-status=blocker
 audio/1_playback_hdmi_.* certification-status=blocker
@@ -60,10 +59,9 @@ include:
 (after-suspend-manual-)?audio/1_playback_displayport_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_type-c_displayport_.* certification-status=blocker
 (after-suspend-manual-)?audio/1_playback_type-c_displayport_.* certification-status=blocker
- (after-suspend-manual-)?monitor/type-c-to-hdmi certification-status=blocker
- # placeholder for (after-suspend-manual-)?monitor/1_type-c_hdmi_.*
+ (after-suspend-manual-)?monitor/1_type-c_hdmi_.* certification-status=blocker
 (after-suspend-manual-)?audio/1_playback_type-c_hdmi_.* certification-status=blocker
- (after-suspend-manual-)?monitor/type-c-to-vga certification-status=blocker
+ (after-suspend-manual-)?monitor/1_type-c_vga_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_dvi_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_hdmi_.* certification-status=blocker
 (after-suspend-manual-)?audio/1_playback_hdmi_.* certification-status=blocker
@@ -109,21 +107,63 @@ include:
 monitor/2_powersaving_.* certification-status=blocker
 monitor/2_dim_brightness_.* certification-status=blocker
 monitor/2_displayport_.* certification-status=blocker
- monitor/2_type-c_displayport_.* certification-status=blocker
 audio/2_playback_displayport_.* certification-status=blocker
+ monitor/2_type-c_displayport_.* certification-status=blocker
 audio/2_playback_type-c_displayport_.* certification-status=blocker
+ monitor/2_type-c_hdmi_.* certification-status=blocker
+ audio/2_playback_type-c_hdmi_.* certification-status=blocker
+ monitor/2_type-c_vga_.* certification-status=blocker
 monitor/2_dvi_.* certification-status=blocker
 monitor/2_hdmi_.* certification-status=blocker
 audio/2_playback_hdmi_.* certification-status=blocker
 monitor/2_thunderbolt_.* certification-status=blocker
- monitor/2_thunderbolt3_.* certification-status=non-blocker
 audio/2_playback_thunderbolt_.* certification-status=blocker
+ monitor/2_thunderbolt3_.* certification-status=non-blocker
 audio/2_playback_thunderbolt3_.* certification-status=non-blocker
 monitor/2_vga_.* certification-status=blocker
 monitor/2_multi-head_.* certification-status=blocker
 bootstrap_include:
 graphics_card
 
+
+id: after-suspend-monitor-discrete-gpu-cert-full
+unit: test plan
+_name: Monitor tests (after suspend, integrated GPU)
+_description: Monitor tests (after suspend, integrated GPU)
+include:
+nested_part:
+ after-suspend-manual-monitor-discrete-gpu-cert-manual
+
+
+id: after-suspend-manual-monitor-discrete-gpu-cert-manual
+unit: test plan
+_name: Monitor tests (after manual suspend, discrete GPU) (Manual)
+_description:
+ Monitor tests (after manual suspend, discrete GPU) (Manual)
+include:
+ (after-suspend-manual-)?monitor/2_powersaving_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_dim_brightness_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_type-c_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_type-c_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_type-c_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_type-c_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_type-c_vga_.* certification-status=blocker 
+ (after-suspend-manual-)?monitor/2_dvi_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?thunderbolt/daisy-chain certification-status=blocker
+ (after-suspend-manual-)?monitor/2_thunderbolt3_.* certification-status=non-blocker
+ (after-suspend-manual-)?audio/2_playback_thunderbolt3_.* certification-status=non-blocker
+ (after-suspend-manual-)?thunderbolt3/daisy-chain certification-status=non-blocker
+ (after-suspend-manual-)?monitor/2_vga_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_multi-head_.* certification-status=blocker
+bootstrap_include:
+ graphics_card
+
 id: monitor-discrete-gpu-cert-automated
 unit: test plan
 _name: Monitor tests (discrete GPU) (Automated)