From d7a135d20b0434a46bf721981b5a51a5829da7de Mon Sep 17 00:00:00 2001 From: Daniel Manrique Date: Wed, 7 May 2014 16:40:56 -0400 Subject: providers:checkbox: Convert display_after_suspend to a local job to generate per-card subjobs. Also added a job to generate per-card suspend jobs, this is because our whitelist can't specify the same job twice (it runs only once). This job depends on suspend/suspend_advanced so it won't run if the suspend functionality is broken. --- jobs/graphics.txt.in | 7 +++--- jobs/suspend.txt.in | 66 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in index ca33b54..ad1867d 100644 --- a/jobs/graphics.txt.in +++ b/jobs/graphics.txt.in @@ -485,9 +485,10 @@ command: PURPOSE: Manually switch to the $product card. STEPS: - 1. Using the appropriate tool (either NVidia settings or AMD Control Center), switch your system to use the $product graphics card. This will require restarting your session. - 2. Once the session restarts, please restart this testing program and select "continue" when prompted for a resume action. - 3. Don't answer the verification question until the system has restarted with the $product card enabled. + 1. If your system is already running with the $product card, then no action is necessary. + 2. Using the appropriate tool (either NVidia settings or AMD Control Center), switch your system to use the $product graphics card. This will require restarting your session. + 3. Once the session restarts, please restart this testing program and select "continue" when prompted for a resume action. + 4. Don't answer the verification question until the system has restarted with the $product card enabled. VERIFICATION: Is the system using the $product card now? EOF diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in index bbd3769..f0e86e3 100644 --- a/jobs/suspend.txt.in +++ b/jobs/suspend.txt.in @@ -235,6 +235,42 @@ _description: Did your system suspend and resume correctly? (NOTE: Please only consider whether the system successfully suspended and resumed. Power/Suspend LED verification will occur after this test is completed.) +id: suspend/generator_suspend_after_switch_to_card +requires: device.category == 'VIDEO' +_description: Suspend after graphics card switch tests +_summary: Suspend after graphics card switch tests +plugin: local +command: + cat <<'EOF' | run_templates -t -s 'graphics_card_resource' + plugin: user-verify + id: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'` + depends: suspend/suspend_advanced + user: root + environ: PLAINBOX_SESSION_SHARE + command: + if type -P fwts >/dev/null; then + echo "Calling fwts" + set -o pipefail; fwts_test -f none -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 + else + echo "Calling sleep_test" + set -o pipefail; sleep_test -p + fi + estimated_duration: 90.0 + _summary: Test suspend/resume after switching to $product + _description: + PURPOSE: + This test will check suspend and resume after switching to $product graphics card. + STEPS: + 1. Ensure you have switched to $product graphics card. + 2. Click "Test" and your system will suspend for about 30 - 60 seconds + 3. Observe the Power LED to see if it blinks or changes color during suspend + 4. If your system does not wake itself up after 60 seconds, please press the power button momentarily to wake the system manually + 5. If your system fails to wake at all and must be rebooted, restart System Testing after reboot and mark this test as Failed + VERIFICATION: + Did your system suspend and resume correctly after switching to $product graphics card? + (NOTE: Please only consider whether the system successfully suspended and resumed. Power/Suspend LED verification will occur after this test is completed.) + EOF + plugin: shell id: suspend/suspend_advanced_auto requires: @@ -395,17 +431,25 @@ _description: Verify that all memory is available after resuming from suspend. command: meminfo_resource | diff $PLAINBOX_SESSION_SHARE/meminfo_before_suspend - -plugin: manual -id: suspend/display_after_suspend -estimated_duration: 120.0 -depends: suspend/suspend_advanced -_description: - PURPOSE: - This test will check that the display is correct after suspend and resume - STEPS: - 1. Check that your display does not show up visual artifacts after resuming. - VERIFICATION: - Does the display work normally after resuming from suspend? +id: suspend/generator_display_after_suspend +requires: device.category == 'VIDEO' +_description: Display after suspend tests +_summary: Display after suspend tests +plugin: local +command: + cat <<'EOF' | run_templates -t -s 'graphics_card_resource' + plugin: user-interact-verify + id: suspend/`echo ${index}`_display_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'` + depends: suspend/suspend_advanced + _summary: Test display function after suspend for $product + _description: + PURPOSE: + This test will check that the display is correct after suspend and resume on the $product graphics card. + STEPS: + 1. Check that your display does not show up visual artifacts after resuming. + VERIFICATION: + Does the display work normally after resuming from suspend using the $product graphics card? + EOF plugin: shell id: suspend/wireless_after_suspend -- cgit v1.2.3