Merge lp:~cr3/checkbox-certification/attachments_move into lp:checkbox-certification

Proposed by Marc Tardif
Status: Merged
Merged at revision: 550
Proposed branch: lp:~cr3/checkbox-certification/attachments_move
Merge into: lp:checkbox-certification
Diff against target: 125 lines (+43/-42)
3 files modified
data/client-cert.whitelist (+21/-21)
data/client-selftest.whitelist (+21/-21)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~cr3/checkbox-certification/attachments_move
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+130419@code.launchpad.net

Commit message

Merged moving of attachment jobs in client certification whitelists.

Description of the change

This moves the attachment jobs from immediately after the resource jobs to the very end of the client certification whitelists. This makes testing slightly more efficient.

Note that the change was not done for the server certification whitelists because they are already automated.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

All the newer jobs appear at the end of the list, where the original attachment jobs were all alphabetized to make reading easier.

Since they don't depend on running in a particular order, do you think it would be worthwhile to take this opportunity to clean them up a bit to make reading them easier down the road?

Also, another thought, would it be worthwhile to move the other attachment jobs into that section, or do you think they'd be better off where they are right now (thinking of things like the suspend_single_log attach job, suspend_30_cycles_log attach job, and other similar ones that run after actual tests).

review: Needs Information
Revision history for this message
Jeff Lane  (bladernr) wrote :

I meant to add that I'm fine with this as is, the comment above is curiosity rather than critique.

Revision history for this message
Marc Tardif (cr3) wrote :

I don't understand what you mean by "the original attachment jobs were all alphabetized to make reading easier." I thought I kept the original order, or did I miss something?

As for adding some of the other attachments, I think it's easier for sections to map to the corresponding file as closely as possible. For example, the attachment jobs under the __info__ section in the whitelists all map to the jobs in the info.txt.in file. I realize this has been affected quite significantly by your changes to move automated tests at the bottom of the whitelist. However, that was such a significant improvement that the benefits outweighed the readability. In this case, I think that the few other attachments scattered throughout the other parts of the whitelist file don't impact running checkbox as much so I'd keep things simple.

Revision history for this message
Jeff Lane  (bladernr) wrote :

Nevermind... they haven't changed as much as I thought they had. For example, an older version of the "certification" whitelist shows this:

codecs_attach
cpuinfo_attach
dmesg_attach
dmi_attach
dmidecode_attach
lspci_attach
modprobe_attach
modules_attach
sysctl_attach
udev_attach

Where the current one shows this:
codecs_attachment
cpuinfo_attachment
dmesg_attachment
dmi_attachment
dmidecode_attachment
efi_attachment
lspci_attachment
meminfo_attachment
modprobe_attachment
modules_attachment
sysctl_attachment
sysfs_attachment
udev_attachment
lsmod_attachment
acpi_sleep_attachment
info/hdparm
info/hdparm_.*.txt
installer_debug.gz
info/touchpad_driver

I was just wondering if alphabetizing them would make them easier to read in a side by side comparison when we're making sure new jobs have been properly applied between lists.

For example:

list1 list2 list3
A A B
B C G
C D F
D E A
E G C
F B D
G F E

Just an exaggerated example to show what I mean. In any case, this is no reason to hold up your merge request, so I'll take it offline instead.

Revision history for this message
Jeff Lane  (bladernr) wrote :

So as I said, no reason to hold this up on a tangential discussion that doesn't really affect this merge. Looks good, approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/client-cert.whitelist'
--- data/client-cert.whitelist 2012-10-17 19:25:07 +0000
+++ data/client-cert.whitelist 2012-10-18 19:45:24 +0000
@@ -24,27 +24,6 @@
24touchpad_scroll24touchpad_scroll
25uname25uname
26usb26usb
27#Info attachment jobs
28__info__
29codecs_attachment
30cpuinfo_attachment
31dmesg_attachment
32dmi_attachment
33dmidecode_attachment
34efi_attachment
35lspci_attachment
36meminfo_attachment
37modprobe_attachment
38modules_attachment
39sysctl_attachment
40sysfs_attachment
41udev_attachment
42lsmod_attachment
43acpi_sleep_attachment
44info/hdparm
45info/hdparm_.*.txt
46installer_debug.gz
47info/touchpad_driver
48# Tests grouped by categories. Categories start with '__'27# Tests grouped by categories. Categories start with '__'
49__audio__28__audio__
50audio/alsa_info_collect29audio/alsa_info_collect
@@ -270,3 +249,24 @@
270power-management/hibernate-30-cycle-log-attach249power-management/hibernate-30-cycle-log-attach
271__stress__250__stress__
272stress/cpu_stress_test251stress/cpu_stress_test
252#Info attachment jobs
253__info__
254codecs_attachment
255cpuinfo_attachment
256dmesg_attachment
257dmi_attachment
258dmidecode_attachment
259efi_attachment
260lspci_attachment
261meminfo_attachment
262modprobe_attachment
263modules_attachment
264sysctl_attachment
265sysfs_attachment
266udev_attachment
267lsmod_attachment
268acpi_sleep_attachment
269info/hdparm
270info/hdparm_.*.txt
271installer_debug.gz
272info/touchpad_driver
273273
=== modified file 'data/client-selftest.whitelist'
--- data/client-selftest.whitelist 2012-10-17 19:25:07 +0000
+++ data/client-selftest.whitelist 2012-10-18 19:45:24 +0000
@@ -22,27 +22,6 @@
22touchpad_scroll22touchpad_scroll
23uname23uname
24usb24usb
25#Info attachment jobs
26__info__
27codecs_attachment
28cpuinfo_attachment
29dmesg_attachment
30dmi_attachment
31dmidecode_attachment
32efi_attachment
33lspci_attachment
34meminfo_attachment
35modprobe_attachment
36modules_attachment
37sysctl_attachment
38sysfs_attachment
39udev_attachment
40lsmod_attachment
41acpi_sleep_attachment
42info/hdparm
43info/hdparm_.*.txt
44installer_debug.gz
45info/touchpad_driver
46# Tests grouped by categories. Categories start with '__'25# Tests grouped by categories. Categories start with '__'
47__audio__26__audio__
48audio/alsa_info_collect27audio/alsa_info_collect
@@ -274,3 +253,24 @@
274power-management/hibernate-30-cycle-log-attach253power-management/hibernate-30-cycle-log-attach
275__stress__254__stress__
276stress/cpu_stress_test255stress/cpu_stress_test
256#Info attachment jobs
257__info__
258codecs_attachment
259cpuinfo_attachment
260dmesg_attachment
261dmi_attachment
262dmidecode_attachment
263efi_attachment
264lspci_attachment
265meminfo_attachment
266modprobe_attachment
267modules_attachment
268sysctl_attachment
269sysfs_attachment
270udev_attachment
271lsmod_attachment
272acpi_sleep_attachment
273info/hdparm
274info/hdparm_.*.txt
275installer_debug.gz
276info/touchpad_driver
277277
=== modified file 'debian/changelog'
--- debian/changelog 2012-10-17 12:32:22 +0000
+++ debian/changelog 2012-10-18 19:45:24 +0000
@@ -57,6 +57,7 @@
57 * Migrated project to Python 3.57 * Migrated project to Python 3.
58 * Munged submission.xml to be consistent with direct submissions.58 * Munged submission.xml to be consistent with direct submissions.
59 * Fixed whitelists to reflect changes in optical tests (LP: #990560)59 * Fixed whitelists to reflect changes in optical tests (LP: #990560)
60 * Moved attachment jobs at the end of client whitelists.
6061
61 [ Daniel Manrique ]62 [ Daniel Manrique ]
62 * Added alsa_info_collect and attachment jobs to certification whitelist,63 * Added alsa_info_collect and attachment jobs to certification whitelist,

Subscribers

People subscribed via source and target branches