Checkbox

Merge lp:~cr3/checkbox/package_linux into lp:checkbox

  1. package_linux
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Approved by: Brendan Donegan
Approved revision: 1754
Merged at revision: 1754
Proposed branch: lp:~cr3/checkbox/package_linux
Merge into: lp:checkbox
Diff against target: 431 lines (+6/-53)
13 files modified
debian/changelog (+1/-0)
jobs/benchmarks.txt.in (+2/-2)
jobs/cpu.txt.in (+0/-4)
jobs/daemons.txt.in (+0/-1)
jobs/disk.txt.in (+0/-4)
jobs/memory.txt.in (+0/-1)
jobs/miscellanea.txt.in (+0/-2)
jobs/networking.txt.in (+1/-2)
jobs/panel_reboot.txt.in (+0/-1)
jobs/power-management.txt.in (+2/-6)
jobs/stress.txt.in (+0/-1)
jobs/suspend.txt.in (+0/-14)
jobs/usb.txt.in (+0/-15)
To merge this branch: bzr merge lp:~cr3/checkbox/package_linux
Reviewer Review Type Date Requested Status
Brendan Donegan (community) Approve
Review via email: mp+128739@code.launchpad.net

Commit message

Merged removal of package.name == 'linux' from jobs.

To post a comment you must log in.
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

At last! Hopefully they've all been caught!

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-10-09 13:40:50 +0000
3+++ debian/changelog 2012-10-09 15:26:23 +0000
4@@ -102,6 +102,7 @@
5 dvd write tests (LP: #1057762)
6 * [FEATURE] jobs/touchpad.txt.in, jobs/touchscreen.txt.in: Added singletouch
7 and multitouch for touchpads and touchscreens.
8+ * Removed package.name == 'linux' only needed by the apport_prompt plugin.
9
10 [Sean Feole]
11 * [FEATURE] scripts/battery_test: measures battery capacity before and after
12
13=== modified file 'jobs/benchmarks.txt.in'
14--- jobs/benchmarks.txt.in 2012-08-08 11:30:42 +0000
15+++ jobs/benchmarks.txt.in 2012-10-09 15:26:23 +0000
16@@ -6,7 +6,7 @@
17 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
18 plugin: shell
19 name: benchmarks/disk/hdparm-read_`ls /sys$path/block`
20- requires: device.path == "$path" and package.name == 'linux'
21+ requires: device.path == "$path"
22 user: root
23 command: hdparm -t /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
24 description: This test runs hdparm timing of device reads as a benchmark for $path
25@@ -20,7 +20,7 @@
26 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
27 plugin: shell
28 name: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block`
29- requires: device.path == "$path" and package.name == 'linux'
30+ requires: device.path == "$path"
31 user: root
32 command: hdparm -T /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
33 description: This test runs hdparm timing of cache reads as a benchmark for $path
34
35=== modified file 'jobs/cpu.txt.in'
36--- jobs/cpu.txt.in 2012-09-12 12:58:35 +0000
37+++ jobs/cpu.txt.in 2012-10-09 15:26:23 +0000
38@@ -1,7 +1,6 @@
39 plugin: shell
40 name: cpu/scaling_test
41 requires:
42- package.name == 'linux'
43 package.name == 'fwts'
44 user: root
45 environ: CHECKBOX_DATA
46@@ -18,14 +17,12 @@
47
48 plugin: shell
49 name: cpu/clocktest
50-requires: package.name == 'linux'
51 command: clocktest
52 _description:
53 Test for clock jitter.
54
55 plugin: shell
56 name: cpu/offlining_test
57-requires: package.name == 'linux'
58 user: root
59 command: cpu_offlining
60 _description:
61@@ -40,7 +37,6 @@
62
63 plugin: shell
64 name: cpu/frequency_governors
65-requires: package.name == 'linux'
66 user: root
67 command: nice -n -20 frequency_governors_test --debug
68 _description:
69
70=== modified file 'jobs/daemons.txt.in'
71--- jobs/daemons.txt.in 2011-10-05 21:01:59 +0000
72+++ jobs/daemons.txt.in 2012-10-09 15:26:23 +0000
73@@ -56,7 +56,6 @@
74 name: daemons/udevd
75 requires:
76 package.name == 'udevd'
77- package.name == 'linux'
78 command: pgrep -f '/sbin/udevd' >/dev/null
79 _description: Test if the udevd daemon is running when the package is installed.
80
81
82=== modified file 'jobs/disk.txt.in'
83--- jobs/disk.txt.in 2012-08-08 20:22:25 +0000
84+++ jobs/disk.txt.in 2012-10-09 15:26:23 +0000
85@@ -14,7 +14,6 @@
86 requires:
87 device.path == "$path"
88 block_device.`ls /sys$path/block`_state != 'removable'
89- package.name == 'linux'
90 user: root
91 command: disk_stats_test `ls /sys$path/block | sed 's|!|/|'`
92 description: This test checks disk stats, generates some activity and rechecks stats to verify they've changed. It also verifies that disks appear in the various files they're supposed to.
93@@ -24,7 +23,6 @@
94 name: disk/smart
95 requires:
96 package.name == 'smartmontools'
97- package.name == 'linux'
98 device.category == 'DISK'
99 _description: SMART test
100 command:
101@@ -69,7 +67,6 @@
102 requires:
103 device.path == "$path"
104 block_device.`ls /sys$path/block`_state != 'removable'
105- package.name == 'linux'
106 description: Disk performance test for $product
107 user: root
108 command: disk_read_performance_test `ls /sys$path/block | sed 's|!|/|'`
109@@ -88,7 +85,6 @@
110 requires:
111 device.path == "$path"
112 block_device.`ls /sys$path/block`_state != 'removable'
113- package.name == 'linux'
114 description: Disk I/O stress test for $product
115 command: storage_test `ls /sys$path/block | sed 's|!|/|'`
116 EOF
117
118=== modified file 'jobs/memory.txt.in'
119--- jobs/memory.txt.in 2012-01-18 15:31:23 +0000
120+++ jobs/memory.txt.in 2012-10-09 15:26:23 +0000
121@@ -8,7 +8,6 @@
122
123 plugin: shell
124 name: memory/check
125-requires: package.name == 'linux'
126 user: root
127 command: memory_test
128 _description:
129
130=== modified file 'jobs/miscellanea.txt.in'
131--- jobs/miscellanea.txt.in 2012-08-22 14:24:59 +0000
132+++ jobs/miscellanea.txt.in 2012-10-09 15:26:23 +0000
133@@ -15,7 +15,6 @@
134 plugin: manual
135 name: miscellanea/chvt
136 requires:
137- package.name == 'linux'
138 package.name == 'kbd'
139 user: root
140 command: cycle_vts
141@@ -30,7 +29,6 @@
142 plugin: shell
143 name: miscellanea/fwts_test
144 requires:
145- package.name == 'linux'
146 package.name == 'fwts'
147 user: root
148 _description:
149
150=== modified file 'jobs/networking.txt.in'
151--- jobs/networking.txt.in 2012-09-27 09:00:46 +0000
152+++ jobs/networking.txt.in 2012-10-09 15:26:23 +0000
153@@ -21,7 +21,7 @@
154 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
155 plugin: manual
156 name: networking/info_$2
157- requires: device.path == "$1" and package.name == 'linux'
158+ requires: device.path == "$1"
159 command: network_info $2
160 _description:
161 PURPOSE:
162@@ -114,7 +114,6 @@
163 plugin: shell
164 name: networking/multi_nic_$2
165 requires:
166- package.name == 'linux'
167 package.name == 'ethtool' and package.name == 'nmap'
168 device.path == "$1"
169 user: root
170
171=== modified file 'jobs/panel_reboot.txt.in'
172--- jobs/panel_reboot.txt.in 2011-10-07 18:59:33 +0000
173+++ jobs/panel_reboot.txt.in 2012-10-09 15:26:23 +0000
174@@ -1,6 +1,5 @@
175 plugin: manual
176 name: panel_reboot_test
177-requires: package.name == 'linux'
178 _description:
179 PURPOSE:
180 This test will verify that you can reboot your system from the desktop menu
181
182=== modified file 'jobs/power-management.txt.in'
183--- jobs/power-management.txt.in 2012-09-21 16:58:06 +0000
184+++ jobs/power-management.txt.in 2012-10-09 15:26:23 +0000
185@@ -15,7 +15,6 @@
186 user: root
187 _description: Test ACPI Wakealarm (fwts wakealarm)
188 requires:
189- package.name == 'linux'
190 package.name == 'fwts'
191 command: fwts_test -w -l $CHECKBOX_DATA/fwts-wakealarm.log
192
193@@ -24,7 +23,6 @@
194 depends: power-management/fwts_wakealarm
195 _description: Attach log from fwts wakealarm test
196 requires:
197- package.name == 'linux'
198 package.name == 'fwts'
199 command: [ -e ${CHECKBOX_DATA}/fwts-wakealarm.log ] && cat ${CHECKBOX_DATA}/fwts-wakealarm.log
200
201@@ -90,7 +88,7 @@
202
203 plugin: manual
204 name: power-management/lid_close
205-requires: device.product == 'Lid Switch' and package.name == 'linux'
206+requires: device.product == 'Lid Switch'
207 command:
208 for i in `seq 20`; do
209 state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'`
210@@ -108,7 +106,7 @@
211
212 plugin: manual
213 name: power-management/lid_open
214-requires: device.product == 'Lid Switch' and package.name == 'linux'
215+requires: device.product == 'Lid Switch'
216 command:
217 for i in `seq 20`; do
218 state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'`
219@@ -128,7 +126,6 @@
220
221 plugin: shell
222 name: power-management/rtc
223-requires: package.name == 'linux'
224 command:
225 test -e /dev/rtc || ( echo "ERROR: Real Time Clock not found" >&2 && exit 1 )
226 _description:
227@@ -136,7 +133,6 @@
228
229 plugin: shell
230 name: power-management/tickless_idle
231-requires: package.name == 'linux'
232 _description: Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple regression check)
233 command:
234 zgrep 'CONFIG_NO_HZ=y' /boot/config-`uname -r` >/dev/null 2>&1 || ( echo "WARNING: Tickless Idle is NOT set" >&2 && exit 1 )
235
236=== modified file 'jobs/stress.txt.in'
237--- jobs/stress.txt.in 2012-09-19 16:12:11 +0000
238+++ jobs/stress.txt.in 2012-10-09 15:26:23 +0000
239@@ -1,7 +1,6 @@
240 plugin: shell
241 name: stress/cpu_stress_test
242 requires:
243- package.name == 'linux'
244 package.name == 'stress'
245 user: root
246 command: stress --cpu `cpuinfo_resource | awk '/count:/ {print $2}'` --vm `awk '/MemTotal/ {num_vm = $2/262144; if (num_vm != int(num_vm)) num_vm = int(num_vm) + 1; print num_vm}' /proc/meminfo` --timeout 7200
247
248=== modified file 'jobs/suspend.txt.in'
249--- jobs/suspend.txt.in 2012-10-04 07:23:21 +0000
250+++ jobs/suspend.txt.in 2012-10-09 15:26:23 +0000
251@@ -19,15 +19,11 @@
252
253 plugin: shell
254 name: suspend/cpu_before_suspend
255-requires:
256- package.name == 'linux'
257 _description: Verify that all the CPUs are online before suspending
258 command: cpuinfo_resource > $CHECKBOX_DATA/cpuinfo_before_suspend
259
260 plugin: shell
261 name: suspend/memory_before_suspend
262-requires:
263- package.name == 'linux'
264 _description:
265 Dumps memory info to a file for comparison after suspend test has been run
266 command: meminfo_resource > $CHECKBOX_DATA/meminfo_before_suspend
267@@ -191,24 +187,18 @@
268
269 plugin: shell
270 name: suspend/cpu_after_suspend
271-requires:
272- package.name == 'linux'
273 depends: suspend/suspend_advanced suspend/cpu_before_suspend
274 _description: Verify that all CPUs are online after resuming.
275 command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
276
277 plugin: shell
278 name: suspend/cpu_after_suspend_auto
279-requires:
280- package.name == 'linux'
281 depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend
282 _description: Verify that all CPUs are online after resuming.
283 command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
284
285 plugin: shell
286 name: suspend/memory_after_suspend
287-requires:
288- package.name == 'linux'
289 depends: suspend/suspend_advanced suspend/memory_before_suspend
290 _description:
291 Verify that all memory is available after resuming from suspend.
292@@ -216,8 +206,6 @@
293
294 plugin: shell
295 name: suspend/memory_after_suspend_auto
296-requires:
297- package.name == 'linux'
298 depends: suspend/suspend_advanced_auto suspend/memory_before_suspend
299 _description:
300 Verify that all memory is available after resuming from suspend.
301@@ -225,8 +213,6 @@
302
303 plugin: manual
304 name: suspend/display_after_suspend
305-requires:
306- package.name == 'linux'
307 depends: suspend/suspend_advanced
308 _description:
309 PURPOSE:
310
311=== modified file 'jobs/usb.txt.in'
312--- jobs/usb.txt.in 2012-10-01 14:25:12 +0000
313+++ jobs/usb.txt.in 2012-10-09 15:26:23 +0000
314@@ -1,13 +1,11 @@
315 plugin: shell
316 name: usb/detect
317-requires: package.name == 'linux'
318 command: lsusb | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
319 _description: Detects and shows USB devices attached to this system.
320
321 plugin: manual
322 name: usb/disk_detect
323 depends: usb/detect
324-requires: package.name == 'linux'
325 command: removable_storage_test -l usb
326 _description:
327 PURPOSE:
328@@ -23,7 +21,6 @@
329 plugin: manual
330 name: usb/HID
331 depends: usb/detect
332-requires: package.name == 'linux'
333 command: keyboard_test
334 _description:
335 PURPOSE:
336@@ -38,7 +35,6 @@
337 plugin: manual
338 name: usb/insert
339 depends: usb/detect
340-requires: package.name == 'linux'
341 command: removable_storage_watcher insert usb
342 _description:
343 PURPOSE:
344@@ -55,7 +51,6 @@
345 plugin: manual
346 name: usb3/insert
347 requires:
348- package.name == 'linux'
349 usb.usb3 == 'supported'
350 command: removable_storage_watcher -m 500000000 insert usb
351 _description:
352@@ -73,7 +68,6 @@
353 plugin: manual
354 name: usb/remove
355 depends: usb/insert
356-requires: package.name == 'linux'
357 command: removable_storage_watcher remove usb
358 _description:
359 PURPOSE:
360@@ -90,7 +84,6 @@
361 name: usb3/remove
362 depends: usb3/insert
363 requires:
364- package.name == 'linux'
365 usb.usb3 == 'supported'
366 command: removable_storage_watcher -m 500000000 remove usb
367 _description:
368@@ -106,7 +99,6 @@
369
370 plugin: manual
371 name: usb/storage-transfer
372-requires: package.name == 'linux'
373 depends: usb/insert
374 command: removable_storage_test usb
375 _description:
376@@ -123,7 +115,6 @@
377 plugin: manual
378 name: usb3/storage-transfer
379 requires:
380- package.name == 'linux'
381 usb.usb3 == 'supported'
382 depends: usb3/insert
383 command: removable_storage_test -m 500000000 -p 7 usb
384@@ -141,7 +132,6 @@
385 plugin: shell
386 name: usb/storage-automated
387 depends: usb/insert
388-requires: package.name == 'linux'
389 command: removable_storage_test usb
390 _description:
391 This test is automated and executes after the usb/insert test is run.
392@@ -149,7 +139,6 @@
393 plugin: shell
394 name: usb3/storage-automated
395 requires:
396- package.name == 'linux'
397 usb.usb3 == 'supported'
398 depends: usb3/insert
399 command: removable_storage_test -m 500000000 -p 7 usb
400@@ -159,7 +148,6 @@
401 plugin: shell
402 name: usb/storage-preinserted
403 user: root
404-requires: package.name == 'linux'
405 command: removable_storage_test -l usb && removable_storage_test usb
406 _description:
407 This is an automated version of usb/storage-automated and assumes that the
408@@ -170,7 +158,6 @@
409 name: usb3/storage-preinserted
410 user: root
411 requires:
412- package.name == 'linux'
413 usb.usb3 == 'supported'
414 command: removable_storage_test -l usb && removable_storage_test -m 500000000 -p 7 usb
415 _description:
416@@ -180,7 +167,6 @@
417
418 plugin: manual
419 name: usb/panels
420-requires: package.name == 'linux'
421 _description:
422 PURPOSE:
423 This test will check your USB connection.
424@@ -205,7 +191,6 @@
425 requires:
426 device.path == "$path"
427 block_device.`ls /sys$path/block`_state == 'removable' and block_device.`ls /sys$path/block`_usb3 == 'supported'
428- package.name == 'linux'
429 description: USB3 read performance test for $product
430 user: root
431 command: disk_read_performance_test `ls /sys$path/block | sed 's|!|/|'`

Subscribers

People subscribed via source and target branches