Merge lp:~cypressyew/checkbox/add-before-s3-graphic-tests into lp:checkbox

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 3784
Merged at revision: 3789
Proposed branch: lp:~cypressyew/checkbox/add-before-s3-graphic-tests
Merge into: lp:checkbox
Diff against target: 201 lines (+150/-0)
3 files modified
providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu (+8/-0)
providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist (+8/-0)
providers/plainbox-provider-checkbox/jobs/suspend.txt.in (+134/-0)
To merge this branch: bzr merge lp:~cypressyew/checkbox/add-before-s3-graphic-tests
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+259363@code.launchpad.net

Description of the change

Add driver_version_check, compiz_check, video and glxgears tests to be tested after suspend as well.

They will be included in both the client-cert dev whitelist and 14.04 test plan.

I haven't modify the driver_version_after_suspend job to make it do the driver consistency check, for now we could use the output for reference, and improve the test case later, I will open a bug for it later.

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Verified with 201211-12071, I+N systems, driver_version_check, compiz_check, video, glxgears tests after suspend works as expected

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Thanks for working on this, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu'
2--- providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu 2015-05-18 06:25:15 +0000
3+++ providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu 2015-05-18 10:56:52 +0000
4@@ -274,8 +274,12 @@
5 suspend/2_suspend-single-log-attach_.*
6 suspend/2_hybrid_sleep_.* certification-status=non-blocker
7 suspend/2_hybrid-sleep-single-log-attach_.*
8+ suspend/2_compiz_check_after_suspend_.* certification-status=blocker
9+ suspend/2_driver_version_after_suspend_.* certification-status=blocker
10 suspend/2_resolution_after_suspend_.* certification-status=blocker
11 suspend/2_display_after_suspend_.* certification-status=blocker
12+ suspend/2_glxgears_after_suspend_.* certification-status=blocker
13+ suspend/2_video_after_suspend_.* certification-status=blocker
14 suspend/2_cycle_resolutions_after_suspend_.*
15 suspend/2_xrandr_screens_after_suspend_.*.tar.gz
16 power-management/2_hibernate_advanced_.* certification-status=non-blocker
17@@ -289,8 +293,12 @@
18 suspend/suspend-single-log-attach
19 suspend/1_hybrid_sleep_.* certification-status=non-blocker
20 suspend/1_hybrid-sleep-single-log-attach_.*
21+ suspend/compiz_check_after_suspend certification-status=blocker
22+ suspend/driver_version_after_suspend certification-status=blocker
23 suspend/resolution_after_suspend certification-status=blocker
24 suspend/display_after_suspend certification-status=blocker
25+ suspend/glxgears_after_suspend certification-status=blocker
26+ suspend/video_after_suspend certification-status=blocker
27 suspend/cycle_resolutions_after_suspend
28 suspend/xrandr_screens_after_suspend.tar.gz
29 keys/sleep certification-status=blocker
30
31=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist'
32--- providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist 2015-05-18 06:25:15 +0000
33+++ providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist 2015-05-18 10:56:52 +0000
34@@ -289,8 +289,12 @@
35 suspend/2_suspend-single-log-attach_.*
36 suspend/2_hybrid_sleep_.*
37 suspend/2_hybrid-sleep-single-log-attach_.*
38+suspend/2_compiz_check_after_suspend_.*
39+suspend/2_driver_version_after_suspend_.*
40 suspend/2_resolution_after_suspend_.*
41 suspend/2_display_after_suspend_.*
42+suspend/2_glxgears_after_suspend_.*
43+suspend/2_video_after_suspend_.*
44 suspend/2_cycle_resolutions_after_suspend_.*
45 suspend/2_xrandr_screens_after_suspend.tar.gz
46 power-management/2_hibernate_advanced_.*
47@@ -304,8 +308,12 @@
48 suspend/suspend-single-log-attach
49 suspend/1_hybrid_sleep_.*
50 suspend/1_hybrid-sleep-single-log-attach_.*
51+suspend/compiz_check_after_suspend
52+suspend/driver_version_after_suspend
53 suspend/resolution_after_suspend
54 suspend/display_after_suspend
55+suspend/glxgears_after_suspend
56+suspend/video_after_suspend
57 suspend/cycle_resolutions_after_suspend
58 suspend/xrandr_screens_after_suspend.tar.gz
59 keys/sleep
60
61=== modified file 'providers/plainbox-provider-checkbox/jobs/suspend.txt.in'
62--- providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2015-04-29 07:54:05 +0000
63+++ providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2015-05-18 10:56:52 +0000
64@@ -2481,3 +2481,137 @@
65 Did the cursor move?
66 EOF
67
68+id: suspend/generator_compiz_check_after_suspend
69+requires: device.category == 'VIDEO'
70+_description: Compiz support tests after suspend
71+_summary: Compiz support tests after suspend
72+plugin: local
73+command:
74+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
75+ plugin: shell
76+ id: suspend/`echo ${index}`_compiz_check_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
77+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
78+ requires: package.name == 'nux-tools'
79+ command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
80+ estimated_duration: 0.130
81+ _description: Check that $product hardware is able to run compiz after suspend
82+ _summary: Test Compiz support for $product after suspend
83+ EOF
84+
85+plugin: shell
86+id: suspend/compiz_check_after_suspend
87+depends: suspend/suspend_advanced
88+requires: package.name == 'nux-tools'
89+command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
90+estimated_duration: 0.130
91+_description: Check that the hardware is able to run compiz after suspend
92+_summary: Test Compiz support after suspend
93+
94+id: suspend/generator_glxgears_after_suspend
95+requires: device.category == 'VIDEO'
96+_description: glxgears tests after suspend
97+_summary: glxgears tests after suspend
98+plugin: local
99+command:
100+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
101+ plugin: user-interact-verify
102+ id: suspend/`echo ${index}`_glxgears_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
103+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
104+ requires: package.name == 'mesa-utils'
105+ command: glxgears; true
106+ _summary: Test that glxgears works for $product after suspend
107+ _description:
108+ PURPOSE:
109+ This test tests the basic 3D capabilities of your $product video card after suspend
110+ STEPS:
111+ 1. Click "Test" to execute an OpenGL demo. Press ESC at any time to close.
112+ 2. Verify that the animation is not jerky or slow.
113+ VERIFICATION:
114+ 1. Did the 3d animation appear?
115+ 2. Was the animation free from slowness/jerkiness?
116+ EOF
117+
118+plugin: user-interact-verify
119+id: suspend/glxgears_after_suspend
120+depends: suspend/suspend_advanced
121+requires:
122+ package.name == 'mesa-utils'
123+ device.category == 'VIDEO'
124+command: glxgears; true
125+_summary: Test that glxgears works after suspend
126+_description:
127+ PURPOSE:
128+ This test tests the basic 3D capabilities of your $product video card after suspend
129+ STEPS:
130+ 1. Click "Test" to execute an OpenGL demo. Press ESC at any time to close.
131+ 2. Verify that the animation is not jerky or slow.
132+ VERIFICATION:
133+ 1. Did the 3d animation appear?
134+ 2. Was the animation free from slowness/jerkiness?
135+
136+id: suspend/generator_video_after_suspend
137+requires: device.category == 'VIDEO'
138+_description: Display video test after suspend
139+_summary: Display video test after suspend
140+plugin: local
141+command:
142+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
143+ id: suspend/`echo ${index}`_video_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
144+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
145+ plugin: user-interact-verify
146+ requires:
147+ package.name == 'xorg'
148+ package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
149+ command: gst_pipeline_test -t 2 'videotestsrc ! videoconvert ! autovideosink' || gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! autovideosink'
150+ _summary: Test that video can be displayed after suspend with ${product}
151+ _description:
152+ PURPOSE:
153+ This test will test the default display after suspend with a sample video
154+ STEPS:
155+ 1. Click "Test" to display a video test.
156+ VERIFICATION:
157+ Do you see color bars and static?
158+ EOF
159+
160+id: suspend/video_after_suspend
161+plugin: user-interact-verify
162+depends: suspend/suspend_advanced
163+requires:
164+ device.category == 'VIDEO'
165+ package.name == 'xorg'
166+ package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
167+command: gst_pipeline_test -t 2 'videotestsrc ! videoconvert ! autovideosink' || gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! autovideosink'
168+_summary: Test that video can be displayed after suspend
169+_description:
170+ PURPOSE:
171+ This test will test the default display after suspend with a sample video
172+ STEPS:
173+ 1. Click "Test" to display a video test.
174+ VERIFICATION:
175+ Do you see color bars and static?
176+
177+id: suspend/generator_driver_version_after_suspend
178+requires: device.category == 'VIDEO'
179+_description: Driver version tests after suspend
180+_summary: Driver version tests after suspend
181+plugin: local
182+command:
183+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
184+ plugin: shell
185+ id: suspend/`echo ${index}`_driver_version_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
186+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
187+ command: graphics_driver
188+ estimated_duration: 0.500
189+ _description: Parses Xorg.0.Log and discovers the running X driver and version after suspend for the $product graphics card
190+ _summary: Test X driver/version after suspend for $product
191+ EOF
192+
193+id: suspend/driver_version_after_suspend
194+requires: device.category == 'VIDEO'
195+depends: suspend/suspend_advanced
196+plugin: shell
197+command: graphics_driver
198+estimated_duration: 0.500
199+_description: Parses Xorg.0.Log and discovers the running X driver and version after suspend
200+_summary: Test X driver/version after suspend
201+

Subscribers

People subscribed via source and target branches