Make "after suspend" graphic jobs depending on the proper suspend job

A lot of the graphics "after suspend" tests were started after running `suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial` instead of depending on it. If this job fails or is skipped, there is no reason to want to run "after suspend" jobs such as `suspend/{index}_glxgears_after_suspend_{product_slug}_xenial` for instance. 

2 files changed, 8 insertions, 8 deletions

diff --git a/jobs/suspend-graphics.txt.in b/jobs/suspend-graphics.txt.in
index 5b7c6dcb..c85d147a 100644
--- a/jobs/suspend-graphics.txt.in
+++ b/jobs/suspend-graphics.txt.in
@@ -53,7 +53,7 @@ plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_resolution_after_suspend_{product_slug}_xenial
 estimated_duration: 1.2
-depends: suspend/{index}_resolution_before_suspend_{product_slug}_xenial
+depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial suspend/{index}_resolution_before_suspend_{product_slug}_xenial
 _description: Test to see that we have the same resolution after resuming as before.
 command:
 source graphics_env {driver} {index}
@@ -65,7 +65,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_display_after_suspend_{product_slug}_xenial
-after: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
+depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
 _summary: Test display function after suspend for {vendor} {product}
 _description:
 PURPOSE:
@@ -82,7 +82,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial
 requires: package.name == 'xorg'
-after: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
+depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
 estimated_duration: 120.0
 command:
 source graphics_env {driver} {index}
@@ -111,7 +111,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_compiz_check_after_suspend_{product_slug}_xenial
-after: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
+depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
 requires: package.name == 'nux-tools'
 command:
 source graphics_env {driver} {index}
@@ -125,7 +125,7 @@ template-resource: graphics_card
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_glxgears_after_suspend_{product_slug}_xenial
-after: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
+depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
 requires: package.name == 'mesa-utils'
 command:
 source graphics_env {driver} {index}
@@ -145,7 +145,7 @@ _description:
 unit: template
 template-resource: graphics_card
 id: suspend/{index}_video_after_suspend_{product_slug}_xenial
-after: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
+depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 requires:
@@ -169,7 +169,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_driver_version_after_suspend_{product_slug}_xenial
-after: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
+depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
 command:
 source graphics_env {driver} {index}
 graphics_driver
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 26b0f09f..60c489d3 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -242,7 +242,7 @@ id: suspend/{index}_suspend_after_switch_to_card_{product_slug}
 requires:
 sleep.mem == 'supported'
 rtc.state == 'supported'
-depends: graphics/{index}_switch_card_{product_slug}
+depends: suspend/suspend_advanced graphics/{index}_switch_card_{product_slug}
 user: root
 environ: PLAINBOX_SESSION_SHARE
 command: