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
1=== modified file 'data/client-cert.whitelist'
2--- data/client-cert.whitelist 2012-10-17 19:25:07 +0000
3+++ data/client-cert.whitelist 2012-10-18 19:45:24 +0000
4@@ -24,27 +24,6 @@
5 touchpad_scroll
6 uname
7 usb
8-#Info attachment jobs
9-__info__
10-codecs_attachment
11-cpuinfo_attachment
12-dmesg_attachment
13-dmi_attachment
14-dmidecode_attachment
15-efi_attachment
16-lspci_attachment
17-meminfo_attachment
18-modprobe_attachment
19-modules_attachment
20-sysctl_attachment
21-sysfs_attachment
22-udev_attachment
23-lsmod_attachment
24-acpi_sleep_attachment
25-info/hdparm
26-info/hdparm_.*.txt
27-installer_debug.gz
28-info/touchpad_driver
29 # Tests grouped by categories. Categories start with '__'
30 __audio__
31 audio/alsa_info_collect
32@@ -270,3 +249,24 @@
33 power-management/hibernate-30-cycle-log-attach
34 __stress__
35 stress/cpu_stress_test
36+#Info attachment jobs
37+__info__
38+codecs_attachment
39+cpuinfo_attachment
40+dmesg_attachment
41+dmi_attachment
42+dmidecode_attachment
43+efi_attachment
44+lspci_attachment
45+meminfo_attachment
46+modprobe_attachment
47+modules_attachment
48+sysctl_attachment
49+sysfs_attachment
50+udev_attachment
51+lsmod_attachment
52+acpi_sleep_attachment
53+info/hdparm
54+info/hdparm_.*.txt
55+installer_debug.gz
56+info/touchpad_driver
57
58=== modified file 'data/client-selftest.whitelist'
59--- data/client-selftest.whitelist 2012-10-17 19:25:07 +0000
60+++ data/client-selftest.whitelist 2012-10-18 19:45:24 +0000
61@@ -22,27 +22,6 @@
62 touchpad_scroll
63 uname
64 usb
65-#Info attachment jobs
66-__info__
67-codecs_attachment
68-cpuinfo_attachment
69-dmesg_attachment
70-dmi_attachment
71-dmidecode_attachment
72-efi_attachment
73-lspci_attachment
74-meminfo_attachment
75-modprobe_attachment
76-modules_attachment
77-sysctl_attachment
78-sysfs_attachment
79-udev_attachment
80-lsmod_attachment
81-acpi_sleep_attachment
82-info/hdparm
83-info/hdparm_.*.txt
84-installer_debug.gz
85-info/touchpad_driver
86 # Tests grouped by categories. Categories start with '__'
87 __audio__
88 audio/alsa_info_collect
89@@ -274,3 +253,24 @@
90 power-management/hibernate-30-cycle-log-attach
91 __stress__
92 stress/cpu_stress_test
93+#Info attachment jobs
94+__info__
95+codecs_attachment
96+cpuinfo_attachment
97+dmesg_attachment
98+dmi_attachment
99+dmidecode_attachment
100+efi_attachment
101+lspci_attachment
102+meminfo_attachment
103+modprobe_attachment
104+modules_attachment
105+sysctl_attachment
106+sysfs_attachment
107+udev_attachment
108+lsmod_attachment
109+acpi_sleep_attachment
110+info/hdparm
111+info/hdparm_.*.txt
112+installer_debug.gz
113+info/touchpad_driver
114
115=== modified file 'debian/changelog'
116--- debian/changelog 2012-10-17 12:32:22 +0000
117+++ debian/changelog 2012-10-18 19:45:24 +0000
118@@ -57,6 +57,7 @@
119 * Migrated project to Python 3.
120 * Munged submission.xml to be consistent with direct submissions.
121 * Fixed whitelists to reflect changes in optical tests (LP: #990560)
122+ * Moved attachment jobs at the end of client whitelists.
123
124 [ Daniel Manrique ]
125 * Added alsa_info_collect and attachment jobs to certification whitelist,

Subscribers

People subscribed via source and target branches