summaryrefslogtreecommitdiff
path: root/units/suspend
diff options
authorray.chen <ray.chen@canonical.com>2019-01-22 16:56:36 +0800
committerray.chen <ray.chen@canonical.com>2019-01-22 16:56:36 +0800
commit60e772a99da550b42e2bd7bb37e72fe34a6d4602 (patch)
treea3d5851ca2722c67740c97e8a68d5b23560c86d5 /units/suspend
parentfb45ebc238dca3361ef491571d70b774781f08e4 (diff)
Changes to be committed:
modified: units/graphics/test-plan.pxu Replace {index}_switch_card_{product_slug}_xenial with {index}_auto_switch_card_{product_slug}. Rename test id “_xenial” with “_auto”. modified: units/suspend/suspend-graphics.pxu Rename test id form “_xenial” to “ _auto” accordingly. Modified test cases dependency from “after: graphics/{index}_switch_card_{product_slug}_xenial” to “after: graphics/{index}_auto_switch_card_{product_slug}”
Diffstat (limited to 'units/suspend')
-rw-r--r--units/suspend/suspend-graphics.pxu50
1 files changed, 25 insertions, 25 deletions
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index 43a7246..be820a7 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -3,8 +3,8 @@ template-resource: graphics_card
template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: com.canonical.plainbox::suspend
-id: suspend/{index}_resolution_before_suspend_{product_slug}_xenial
-after: graphics/{index}_switch_card_{product_slug}_xenial
+id: suspend/{index}_resolution_before_suspend_{product_slug}_auto
+after: graphics/{index}_auto_switch_card_{product_slug}
estimated_duration: 1.2
_description: Record the current resolution before suspending.
command:
@@ -16,11 +16,11 @@ template-resource: graphics_card
template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: com.canonical.plainbox::suspend
-id: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
+id: suspend/{index}_suspend_after_switch_to_card_{product_slug}_auto
requires:
sleep.mem == 'supported'
rtc.state == 'supported'
-after: graphics/{index}_switch_card_{product_slug}_xenial
+after: graphics/{index}_auto_switch_card_{product_slug}
user: root
environ: PLAINBOX_SESSION_SHARE
command:
@@ -52,12 +52,12 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
template-engine: jinja2
plugin: shell
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_resolution_after_suspend_{{ product_slug }}_xenial
+id: suspend/{{ index }}_resolution_after_suspend_{{ product_slug }}_auto
estimated_duration: 1.2
depends:
- suspend/{{ index }}_resolution_before_suspend_{{ product_slug }}_xenial
+ suspend/{{ index }}_resolution_before_suspend_{{ product_slug }}_auto
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -72,10 +72,10 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
template-engine: jinja2
plugin: manual
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_display_after_suspend_{{ product_slug }}_xenial
+id: suspend/{{ index }}_display_after_suspend_{{ product_slug }}_auto
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -94,11 +94,11 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
template-engine: jinja2
plugin: user-interact-verify
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_cycle_resolutions_after_suspend_{{ product_slug }}_xenial
+id: suspend/{{ index }}_cycle_resolutions_after_suspend_{{ product_slug }}_auto
requires: package.name == 'xorg'
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -119,8 +119,8 @@ template-resource: graphics_card
template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: attachment
category_id: com.canonical.plainbox::suspend
-id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_xenial
-depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial
+id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_auto
+depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_auto
command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
_description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
@@ -130,10 +130,10 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
template-engine: jinja2
plugin: shell
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_compiz_check_after_suspend_{{ product_slug }}_xenial
+id: suspend/{{ index }}_compiz_check_after_suspend_{{ product_slug }}_auto
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -150,10 +150,10 @@ template-resource: graphics_card
template-engine: jinja2
plugin: user-interact-verify
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_glxgears_after_suspend_{{ product_slug }}_xenial
+id: suspend/{{ index }}_glxgears_after_suspend_{{ product_slug }}_auto
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -176,10 +176,10 @@ _description:
unit: template
template-resource: graphics_card
template-engine: jinja2
-id: suspend/{{ index }}_video_after_suspend_{{ product_slug }}_xenial
+id: suspend/{{ index }}_video_after_suspend_{{ product_slug }}_auto
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -206,10 +206,10 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
template-engine: jinja2
plugin: shell
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_driver_version_after_suspend_{{ product_slug }}_xenial
+id: suspend/{{ index }}_driver_version_after_suspend_{{ product_slug }}_auto
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -226,10 +226,10 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
template-engine: jinja2
plugin: attachment
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_suspend-single-log-attach_{{ product_slug }}_xenial
+id: suspend/{{ index }}_suspend-single-log-attach_{{ product_slug }}_auto
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}
@@ -243,10 +243,10 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
template-engine: jinja2
plugin: shell
category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_suspend-time-check_{{ product_slug }}_xenial
+id: suspend/{{ index }}_suspend-time-check_{{ product_slug }}_auto
depends:
{%- if gpu_count > "1" %}
- suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_xenial
+ suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
{%- else %}
suspend/suspend_advanced
{%- endif %}