Checkbox

Merge lp:~brendan-donegan/checkbox/bug1089227 into lp:checkbox

  1. bug1089227
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 1846
Merged at revision: 1846
Proposed branch: lp:~brendan-donegan/checkbox/bug1089227
Merge into: lp:checkbox
Diff against target: 223 lines (+26/-22)
2 files modified
debian/changelog (+3/-0)
jobs/suspend.txt.in (+23/-22)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug1089227
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+139419@code.launchpad.net

Description of the change

Lots of led_after_suspend and key_after_suspend tests were added at one point, but they were mistakenly made to depend on suspend_advanced_auto, which is only for use in whitelists that are fully automated. Manual or semi-manual whitelist should use suspend/suspend_advanced and since the LED and key tests are themselves manual, they should depend on that. One test was also missing a dependency altogether.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Makes sense, thanks +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-11 18:16:13 +0000
3+++ debian/changelog 2012-12-12 09:56:22 +0000
4@@ -14,6 +14,9 @@
5 or other artifacts.
6 * jobs/info.txt.in - add an xrandr attachment job to provide information
7 about displays connected to the system (LP: #1085219)
8+ * jobs/suspend.txt.in - changed suspend_advanced_auto dependency of key_after_suspend
9+ and led_after_suspend tests to suspend/suspend_advanced, since they are manual and
10+ should depend on the manual suspend test (LP: #1089227)
11
12 [ Jeff Lane ]
13 * jobs/suspend.txt.in - removed incorrect multiple router requirement for
14
15=== modified file 'jobs/suspend.txt.in'
16--- jobs/suspend.txt.in 2012-11-21 17:47:17 +0000
17+++ jobs/suspend.txt.in 2012-12-12 09:56:22 +0000
18@@ -641,7 +641,7 @@
19
20 plugin: manual
21 name: suspend/led_after_suspend/power
22-depends: suspend/suspend_advanced_auto
23+depends: suspend/suspend_advanced
24 _description:
25 PURPOSE:
26 Validate that the power LED operated the same after resuming from suspend
27@@ -652,7 +652,7 @@
28
29 plugin: manual
30 name: suspend/led_after_suspend/battery-charging
31-depends: suspend/suspend_advanced_auto
32+depends: suspend/suspend_advanced
33 _description:
34 PURPOSE:
35 Validate that the battery light shows charging status after resuming from suspend
36@@ -664,7 +664,7 @@
37
38 plugin: manual
39 name: suspend/led_after_suspend/battery-charged
40-depends: suspend/suspend_advanced_auto
41+depends: suspend/suspend_advanced
42 _description:
43 PURPOSE:
44 Validate that the battery LED properly displays charged status after resuming from suspend
45@@ -677,6 +677,7 @@
46
47 plugin: manual
48 name: suspend/led_after_suspend/battery-low
49+depends: suspend/suspend_advanced
50 _description:
51 PURPOSE:
52 Validate that the battery LED indicated low power after resuming from suspend
53@@ -688,7 +689,7 @@
54
55 plugin: manual
56 name: suspend/led_after_suspend/hdd
57-depends: suspend/suspend_advanced_auto
58+depends: suspend/suspend_advanced
59 command: led_hdd_test
60 _description:
61 PURPOSE:
62@@ -701,7 +702,7 @@
63
64 plugin: manual
65 name: suspend/led_after_suspend/numeric-keypad
66-depends: suspend/suspend_advanced_auto
67+depends: suspend/suspend_advanced
68 command: keyboard_test
69 _description:
70 PURPOSE:
71@@ -716,7 +717,7 @@
72
73 plugin: manual
74 name: suspend/led_after_suspend/caps-lock
75-depends: suspend/suspend_advanced_auto
76+depends: suspend/suspend_advanced
77 _description:
78 PURPOSE:
79 Validate that the Caps Lock key operates the same before and after resuming from suspend
80@@ -728,7 +729,7 @@
81
82 plugin: manual
83 name: suspend/led_after_suspend/wlan
84-depends: suspend/suspend_advanced_auto
85+depends: suspend/suspend_advanced
86 _description:
87 PURPOSE:
88 WLAN LED verification after resuming from suspend
89@@ -742,7 +743,7 @@
90
91 plugin: manual
92 name: suspend/led_after_suspend/wlan-disabled
93-depends: suspend/suspend_advanced_auto
94+depends: suspend/suspend_advanced
95 _description:
96 PURPOSE:
97 Validate that WLAN LED shuts off when disabled after resuming from suspend
98@@ -756,7 +757,7 @@
99
100 plugin: manual
101 name: suspend/led_after_suspend/bluetooth
102-depends: suspend/suspend_advanced_auto
103+depends: suspend/suspend_advanced
104 _description:
105 PURPOSE:
106 Validate that the Bluetooth LED turns on and off when BT is enabled/disabled after resuming from suspend
107@@ -772,7 +773,7 @@
108 name: suspend/led_after_suspend/camera
109 depends:
110 camera/detect
111- suspend/suspend_advanced_auto
112+ suspend/suspend_advanced
113 command: camera_test led
114 _description:
115 PURPOSE:
116@@ -785,7 +786,7 @@
117
118 plugin: manual
119 name: suspend/led_after_suspend/touchpad
120-depends: suspend/suspend_advanced_auto
121+depends: suspend/suspend_advanced
122 _description:
123 PURPOSE:
124 Touchpad LED verification after resuming from suspend
125@@ -799,7 +800,7 @@
126
127 plugin: manual
128 name: suspend/led_after_suspend/wireless
129-depends: suspend/suspend_advanced_auto
130+depends: suspend/suspend_advanced
131 _description:
132 PURPOSE:
133 Validate Wireless (WLAN + Bluetooth) LED operated the same after resuming from suspend
134@@ -815,7 +816,7 @@
135
136 plugin: manual
137 name: suspend/keys_after_suspend/brightness
138-depends: suspend/suspend_advanced_auto
139+depends: suspend/suspend_advanced
140 requires: dmi.product in ['Notebook','Laptop','Portable']
141 _description:
142 PURPOSE:
143@@ -827,7 +828,7 @@
144
145 plugin: manual
146 name: suspend/keys_after_suspend/volume
147-depends: suspend/suspend_advanced_auto
148+depends: suspend/suspend_advanced
149 requires:
150 device.category == 'KEYBOARD'
151 user: root
152@@ -844,7 +845,7 @@
153
154 plugin: manual
155 name: suspend/keys_after_suspend/mute
156-depends: suspend/suspend_advanced_auto
157+depends: suspend/suspend_advanced
158 requires:
159 device.category == 'KEYBOARD'
160 user: root
161@@ -860,7 +861,7 @@
162
163 plugin: manual
164 name: suspend/keys_after_suspend/sleep
165-depends: suspend/suspend_advanced_auto
166+depends: suspend/suspend_advanced
167 requires:
168 device.category == 'KEYBOARD'
169 _description:
170@@ -874,7 +875,7 @@
171
172 plugin: manual
173 name: suspend/keys_after_suspend/battery-info
174-depends: suspend/suspend_advanced_auto
175+depends: suspend/suspend_advanced
176 requires: dmi.product in ['Notebook','Laptop','Portable']
177 user: root
178 command: key_test -s '0xe071,0xef1:Battery Info'
179@@ -891,7 +892,7 @@
180
181 plugin: manual
182 name: suspend/keys_after_suspend/wireless
183-depends: suspend/suspend_advanced_auto
184+depends: suspend/suspend_advanced
185 requires: dmi.product in ['Notebook','Laptop','Portable']
186 _description:
187 PURPOSE:
188@@ -904,7 +905,7 @@
189
190 plugin: manual
191 name: suspend/keys_after_suspend/media-control
192-depends: suspend/suspend_advanced_auto
193+depends: suspend/suspend_advanced
194 requires:
195 device.category == 'KEYBOARD'
196 user: root
197@@ -921,7 +922,7 @@
198
199 plugin: manual
200 name: suspend/keys_after_suspend/super
201-depends: suspend/suspend_advanced_auto
202+depends: suspend/suspend_advanced
203 requires:
204 device.category == 'KEYBOARD'
205 user: root
206@@ -937,7 +938,7 @@
207
208 plugin: manual
209 name: suspend/keys_after_suspend/video-out
210-depends: suspend/suspend_advanced_auto
211+depends: suspend/suspend_advanced
212 requires: dmi.product in ['Notebook','Laptop','Portable']
213 _description:
214 PURPOSE:
215@@ -950,7 +951,7 @@
216
217 plugin: manual
218 name: suspend/keys_after_suspend/touchpad
219-depends: suspend/suspend_advanced_auto
220+depends: suspend/suspend_advanced
221 requires: dmi.product in ['Notebook','Laptop','Portable']
222 _description:
223 PURPOSE:

Subscribers

People subscribed via source and target branches