diff options
| -rw-r--r-- | units/graphics/test-plan.pxu | 78 | ||||
| -rw-r--r-- | units/suspend/suspend-graphics.pxu | 27 |
2 files changed, 62 insertions, 43 deletions
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu index 8553ec1..4537dfd 100644 --- a/units/graphics/test-plan.pxu +++ b/units/graphics/test-plan.pxu @@ -51,8 +51,8 @@ include: bootstrap_include: graphics_card nested_part: - com.canonical.certification::graphics-discrete-gpu-cert-manual com.canonical.certification::graphics-discrete-gpu-cert-automated + com.canonical.certification::graphics-discrete-gpu-cert-manual id: graphics-discrete-gpu-cert-manual unit: test plan @@ -60,7 +60,6 @@ _name: Graphics tests (discrete GPU) (Manual) _description: Graphics tests (discrete GPU) (Manual) include: - graphics/2_auto_switch_card_.* certification-status=blocker graphics/2_maximum_resolution_.* certification-status=blocker graphics/2_glxgears_.* certification-status=blocker graphics/2_rotation_.* certification-status=blocker @@ -75,37 +74,58 @@ _name: Graphics tests (discrete GPU) (Automated) _description: Graphics tests (discrete GPU) (Automated) include: - graphics/2_valid_opengl_renderer_.* certification-status=blocker - graphics/2_driver_version_.* certification-status=blocker - graphics/2_compiz_check_.* certification-status=blocker + graphics/2_auto_switch_card_.* certification-status=blocker + graphics/2_valid_opengl_renderer_.* certification-status=blocker + graphics/2_driver_version_.* certification-status=blocker + graphics/2_compiz_check_.* certification-status=blocker graphics/2_minimum_resolution_.* + suspend/2_resolution_before_suspend_.*_auto certification-status=blocker bootstrap_include: graphics_card - id: after-suspend-graphics-integrated-gpu-cert-full unit: test plan _name: After suspend tests (integrated GPU) _description: After suspend tests (integrated GPU) include: - graphics/1_auto_switch_card_.* certification-status=blocker - suspend/1_resolution_before_suspend_.*_auto certification-status=blocker +nested_part: + com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-automated + com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-manual + +id: after-suspend-graphics-integrated-gpu-cert-automated +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 + suspend/1_resolution_before_suspend_.*_auto 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: # suspend/suspend_advanced (one GPU) # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs) - suspend/1_suspend-time-check_.*_auto certification-status=non-blocker - suspend/1_suspend-single-log-attach_.*_auto - power-management/lid certification-status=blocker - power-management/lid_close certification-status=blocker - power-management/lid_open certification-status=blocker - suspend/1_compiz_check_after_suspend_.*_auto certification-status=blocker - suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker - suspend/1_resolution_after_suspend_.*_auto certification-status=blocker - suspend/1_display_after_suspend_.*_graphics certification-status=blocker - suspend/1_glxgears_after_suspend_.*_graphics certification-status=blocker - suspend/1_video_after_suspend_.*_graphics certification-status=blocker - suspend/1_cycle_resolutions_after_suspend_.*_graphics certification-status=non-blocker + suspend/1_suspend-time-check_.*_auto certification-status=non-blocker + suspend/1_suspend-single-log-attach_.*_auto certification-status=non-blocker + suspend/1_compiz_check_after_suspend_.*_auto certification-status=blocker + suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker + suspend/1_resolution_after_suspend_.*_auto certification-status=blocker + +id: after-suspend-graphics-integrated-gpu-cert-manual +unit: test plan +_name: After suspend tests (integrated GPU manual) +_description: After suspend tests (integrated GPU manual) +include: + # The following after suspend jobs will automatically select the right suspend job + # depending on the amount of graphic cards available on the SUT: + # suspend/suspend_advanced (one GPU) + # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs) + power-management/lid certification-status=blocker + power-management/lid_close certification-status=blocker + power-management/lid_open certification-status=blocker + suspend/1_display_after_suspend_.*_graphics certification-status=blocker + suspend/1_glxgears_after_suspend_.*_graphics certification-status=blocker + suspend/1_video_after_suspend_.*_graphics certification-status=blocker + suspend/1_cycle_resolutions_after_suspend_.*_graphics certification-status=non-blocker suspend/1_xrandr_screens_after_suspend.tar.gz_auto id: after-suspend-graphics-discrete-gpu-cert-full @@ -113,13 +133,27 @@ unit: test plan _name: After suspend tests (discrete GPU) _description: After suspend tests (discrete GPU) include: - suspend/2_resolution_before_suspend_.*_auto certification-status=blocker +nested_part: + com.canonical.certification::after-suspend-graphics-discrete-gpu-cert-automated + com.canonical.certification::after-suspend-graphics-discrete-gpu-cert-manual + +id: after-suspend-graphics-discrete-gpu-cert-automated +unit: test plan +_name: After suspend tests (discrete GPU automated) +_description: After suspend tests (discrete GPU automated) +include: suspend/2_suspend_after_switch_to_card_.*_auto certification-status=blocker suspend/2_suspend-time-check_.*_auto certification-status=non-blocker suspend/2_suspend-single-log-attach_.*_auto certification-status=non-blocker suspend/2_compiz_check_after_suspend_.*_auto certification-status=blocker suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker suspend/2_resolution_after_suspend_.*_auto certification-status=blocker + +id: after-suspend-graphics-discrete-gpu-cert-manual +unit: test plan +_name: After suspend tests (discrete GPU manual) +_description: After suspend tests (discrete GPU manual) +include: suspend/2_display_after_suspend_.*_graphics certification-status=blocker suspend/2_glxgears_after_suspend_.*_graphics certification-status=blocker suspend/2_video_after_suspend_.*_graphics certification-status=blocker @@ -184,7 +218,7 @@ _name: After suspend tests (discrete GPU, certification blockers only) _description: After suspend tests (discrete GPU, certification blockers only) include: suspend/2_resolution_before_suspend_.*_auto certification-status=blocker - suspend/2_suspend_after_switch_to_card_.*_auto certification-status=blocker + suspend/2_suspend_after_switch_to_card_.*_graphics certification-status=blocker suspend/2_compiz_check_after_suspend_.*_auto certification-status=blocker suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker suspend/2_resolution_after_suspend_.*_auto certification-status=blocker diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu index b6fb230..d4fe923 100644 --- a/units/suspend/suspend-graphics.pxu +++ b/units/suspend/suspend-graphics.pxu @@ -14,7 +14,7 @@ command: unit: template template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' -plugin: user-interact-verify +plugin: shell category_id: com.canonical.plainbox::suspend id: suspend/{index}_suspend_after_switch_to_card_{product_slug}_auto requires: @@ -24,27 +24,12 @@ after: graphics/{index}_auto_switch_card_{product_slug} user: root environ: PLAINBOX_SESSION_SHARE command: - if type -P fwts >/dev/null; then - echo "Calling fwts" - set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log - else - echo "Calling sleep_test" - set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log + if [[ -v SNAP ]]; then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" fi -estimated_duration: 90.0 -_summary: Test suspend/resume after switching to {vendor} {product} -_description: - PURPOSE: - This test will check suspend and resume after switching to {vendor} {product} graphics card. - STEPS: - 1. Ensure you have switched to {vendor} {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 {vendor} {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.) + set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log +estimated_duration: 1m30s +_summary: Test auto suspend/resume after switching to {vendor} {product} unit: template template-resource: graphics_card |