add after-suspend-auto-switch-card

graphics/1_auto_switch_card_.* already existed in test plan "graphics-integrated-gpu-cert-automated" Add "also-after-suspend" flag to generate another auto_switch_card that can use after suspend for test plan "after-suspend-graphics-integrated-gpu-cert-automated" Also fixed the same problem for blockers test plan. 

2 files changed, 16 insertions, 15 deletions

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index a8224ef..01ec380 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -538,4 +538,4 @@ user: root
 command:
 {switch_to_cmd}
 pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn preserve-locale
+flags: noreturn preserve-locale also-after-suspend
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index fd52dc7..4b8c7ec 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -99,7 +99,7 @@ unit: test plan
 _name: After suspend tests (integrated GPU automated)
 _description: After suspend tests (integrated GPU automated)
 include:
- graphics/1_auto_switch_card_.* certification-status=blocker
+ after-suspend-graphics/1_auto_switch_card_.* certification-status=blocker
 suspend/1_suspend_after_switch_to_card_.*_auto certification-status=blocker
 # The following after suspend jobs will automatically select the right suspend job
 # depending on the amount of graphic cards available on the SUT:
@@ -166,16 +166,18 @@ unit: test plan
 _name: Graphics tests (integrated GPU, certification blockers only)
 _description: Graphics tests (integrated GPU, certification blockers only)
 include:
- graphics/xorg-version certification-status=blocker
- graphics/xorg-failsafe certification-status=blocker
- graphics/xorg-process certification-status=blocker
- graphics/VESA_drivers_not_in_use certification-status=blocker
- graphics/1_maximum_resolution_.* certification-status=blocker
- graphics/1_glxgears_.* certification-status=blocker
- graphics/1_driver_version_.* certification-status=blocker
- graphics/1_compiz_check_.* certification-status=blocker
- graphics/1_rotation_.* certification-status=blocker
- graphics/1_video_.* certification-status=blocker
+ graphics/1_auto_switch_card_.* certification-status=blocker
+ graphics/xorg-version certification-status=blocker
+ graphics/xorg-failsafe certification-status=blocker
+ graphics/xorg-process certification-status=blocker
+ graphics/VESA_drivers_not_in_use certification-status=blocker
+ graphics/1_maximum_resolution_.* certification-status=blocker
+ graphics/1_glxgears_.* certification-status=blocker
+ graphics/1_driver_version_.* certification-status=blocker
+ graphics/1_compiz_check_.* certification-status=blocker
+ graphics/1_rotation_.* certification-status=blocker
+ graphics/1_video_.* certification-status=blocker
+ suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
 bootstrap_include:
 graphics_card
 
@@ -200,9 +202,8 @@ unit: test plan
 _name: After suspend tests (integrated GPU, certification blockers only)
 _description: After suspend tests (integrated GPU, certification blockers only)
 include:
- graphics/1_auto_switch_card_.* certification-status=blocker
- suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
- suspend/suspend_advanced certification-status=blocker
+ after-suspend-graphics/1_auto_switch_card_.* certification-status=blocker
+ suspend/1_suspend_after_switch_to_card_.*_auto certification-status=blocker
 power-management/lid certification-status=blocker
 power-management/lid_close certification-status=blocker
 power-management/lid_open certification-status=blocker