add monitor tests to the after-suspend bunch

Fixes: LP:#1780026 Signed-off-by: Maciej Kisielewski <maciej.kisielewski@canonical.com> 

4 files changed, 47 insertions, 31 deletions

diff --git a/units/audio/jobs.pxu b/units/audio/jobs.pxu
index fa75447..120a9bd 100644
--- a/units/audio/jobs.pxu
+++ b/units/audio/jobs.pxu
@@ -49,6 +49,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
+flags: also-after-suspend-manual
 command:
 audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
 audio_settings set --verbose --device=hdmi --volume=50
@@ -77,6 +78,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
+flags: also-after-suspend-manual
 command:
 audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
 audio_settings set --verbose --device=hdmi --volume=50
@@ -106,6 +108,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
+flags: also-after-suspend-manual
 command:
 audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
 audio_settings set --verbose --device=hdmi --volume=50
@@ -135,6 +138,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
+flags: also-after-suspend-manual
 command:
 audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
 audio_settings set --verbose --device=hdmi --volume=50
@@ -165,6 +169,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
+flags: also-after-suspend-manual
 command:
 audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
 audio_settings set --verbose --device=hdmi --volume=50
diff --git a/units/monitor/jobs.pxu b/units/monitor/jobs.pxu
index 6c1ac58..fc7864f 100644
--- a/units/monitor/jobs.pxu
+++ b/units/monitor/jobs.pxu
@@ -3,6 +3,7 @@ template-resource: graphics_card
 template-filter: graphics_card.prime_gpu_offload == 'Off'
 id: monitor/{index}_vga_{product_slug}
 requires: display.vga == 'supported' or display.dp == 'supported'
+flags: also-after-suspend-manual
 plugin: manual
 category_id: com.canonical.plainbox::monitor
 _purpose:
@@ -18,6 +19,7 @@ template-resource: graphics_card
 template-filter: graphics_card.prime_gpu_offload == 'Off'
 id: monitor/{index}_dvi_{product_slug}
 requires: display.dvi == 'supported'
+flags: also-after-suspend-manual
 plugin: manual
 category_id: com.canonical.plainbox::monitor
 _purpose:
@@ -33,6 +35,7 @@ template-resource: graphics_card
 template-filter: graphics_card.prime_gpu_offload == 'Off'
 id: monitor/{index}_displayport_{product_slug}
 requires: display.dp == 'supported'
+flags: also-after-suspend-manual
 plugin: manual
 category_id: com.canonical.plainbox::monitor
 _purpose:
@@ -48,6 +51,7 @@ template-resource: graphics_card
 template-filter: graphics_card.prime_gpu_offload == 'Off'
 id: monitor/{index}_hdmi_{product_slug}
 requires: display.hdmi == 'supported'
+flags: also-after-suspend-manual
 plugin: manual
 category_id: com.canonical.plainbox::monitor
 _purpose:
@@ -93,6 +97,7 @@ template-resource: graphics_card
 template-filter: graphics_card.prime_gpu_offload == 'Off'
 id: monitor/{index}_multi-head_{product_slug}
 requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower', 'Space-saving']
+flags: also-after-suspend-manual
 plugin: manual
 category_id: com.canonical.plainbox::monitor
 _purpose:
@@ -109,6 +114,7 @@ _verification:
 unit: template
 template-resource: graphics_card
 template-filter: graphics_card.prime_gpu_offload == 'Off'
+flags: also-after-suspend-manual
 id: monitor/{index}_powersaving_{product_slug}
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::monitor
@@ -146,6 +152,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 id: monitor/{index}_thunderbolt_{product_slug}
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt == 'True'
+flags: also-after-suspend-manual
 estimated_duration: 15.0
 plugin: manual
 category_id: com.canonical.plainbox::monitor
@@ -167,6 +174,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 id: monitor/{index}_thunderbolt3_{product_slug}
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
+flags: also-after-suspend-manual
 estimated_duration: 15.0
 plugin: manual
 category_id: com.canonical.plainbox::monitor
@@ -188,6 +196,7 @@ id: monitor/{index}_type-c_displayport_{product_slug}
 template-filter: graphics_card.prime_gpu_offload == 'Off'
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_usb_type_c == 'True'
+flags: also-after-suspend-manual
 estimated_duration: 15.0
 plugin: manual
 category_id: com.canonical.plainbox::monitor
diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu
index 344b304..3eada6b 100644
--- a/units/monitor/test-plan.pxu
+++ b/units/monitor/test-plan.pxu
@@ -16,23 +16,23 @@ _name: Monitor tests (integrated GPU) (Manual)
 _description:
 Monitor tests (integrated GPU) (Manual)
 include:
- monitor/1_powersaving_.* certification-status=blocker
- monitor/1_dim_brightness_.* certification-status=blocker
- monitor/1_displayport_.* certification-status=blocker
- monitor/1_type-c_displayport_.* certification-status=blocker
- audio/1_playback_displayport_.* certification-status=blocker
- audio/1_playback_type-c_displayport_.* certification-status=blocker
- monitor/1_dvi_.* certification-status=blocker
- monitor/1_hdmi_.* certification-status=blocker
- audio/1_playback_hdmi_.* certification-status=blocker
- monitor/1_thunderbolt_.* certification-status=blocker
- monitor/1_thunderbolt3_.* certification-status=non-blocker
- audio/1_playback_thunderbolt_.* certification-status=blocker
- audio/1_playback_thunderbolt3_.* certification-status=non-blocker
- thunderbolt/daisy-chain certification-status=blocker
- thunderbolt3/daisy-chain certification-status=non-blocker
- monitor/1_vga_.* certification-status=blocker
- monitor/1_multi-head_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_powersaving_.* certification-status=blocker
+ monitor/1_dim_brightness_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_type-c_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/1_playback_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/1_playback_type-c_displayport_.* 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
+ (after-suspend-manual-)?monitor/1_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_thunderbolt3_.* certification-status=non-blocker
+ (after-suspend-manual-)?audio/1_playback_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?audio/1_playback_thunderbolt3_.* certification-status=non-blocker
+ (after-suspend-manual-)?thunderbolt/daisy-chain certification-status=blocker
+ (after-suspend-manual-)?thunderbolt3/daisy-chain certification-status=non-blocker
+ (after-suspend-manual-)?monitor/1_vga_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_multi-head_.* certification-status=blocker
 bootstrap_include:
 graphics_card
 
@@ -97,20 +97,20 @@ unit: test plan
 _name: Monitor tests (integrated GPU, certification blockers only)
 _description: Monitor tests (integrated GPU, certification blockers only)
 include:
- monitor/1_powersaving_.* certification-status=blocker
- monitor/1_dim_brightness_.* certification-status=blocker
- monitor/1_displayport_.* certification-status=blocker
- monitor/1_type-c_displayport_.* certification-status=blocker
- audio/1_playback_displayport_.* certification-status=blocker
- audio/1_playback_type-c_displayport_.* certification-status=blocker
- monitor/1_dvi_.* certification-status=blocker
- monitor/1_hdmi_.* certification-status=blocker
- audio/1_playback_hdmi_.* certification-status=blocker
- monitor/1_thunderbolt_.* certification-status=blocker
- audio/1_playback_thunderbolt_.* certification-status=blocker
- thunderbolt/daisy-chain certification-status=blocker
- monitor/1_vga_.* certification-status=blocker
- monitor/1_multi-head_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_powersaving_.* certification-status=blocker
+ monitor/1_dim_brightness_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_type-c_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/1_playback_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/1_playback_type-c_displayport_.* 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
+ (after-suspend-manual-)?monitor/1_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?audio/1_playback_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?thunderbolt/daisy-chain certification-status=blocker
+ (after-suspend-manual-)?monitor/1_vga_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_multi-head_.* certification-status=blocker
 bootstrap_include:
 graphics_card
 
diff --git a/units/thunderbolt/jobs.pxu b/units/thunderbolt/jobs.pxu
index 188b2f6..14fa3f8 100644
--- a/units/thunderbolt/jobs.pxu
+++ b/units/thunderbolt/jobs.pxu
@@ -57,6 +57,7 @@ category_id: com.canonical.plainbox::disk
 id: thunderbolt/daisy-chain
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt == 'True'
+flags: also-after-suspend-manual
 estimated_duration: 45.0
 command: removable_storage_test -s 268400000 scsi
 _summary: Daisy-chain testing for Thunderbolt storage and display device
@@ -133,6 +134,7 @@ category_id: com.canonical.plainbox::disk
 id: thunderbolt3/daisy-chain
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
+flags: also-after-suspend-manual
 estimated_duration: 45.0
 command: removable_storage_test -s 268400000 scsi
 _summary: Daisy-chain testing for Thunderbolt 3 storage and display device