Canonical Driver Test Suite

Merge lp:~roadmr/cdts/fix-rtc-hibernate into lp:cdts

  1. fix-rtc-hibernate
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Approved by: Daniel Manrique
Approved revision: 42
Merged at revision: 41
Proposed branch: lp:~roadmr/cdts/fix-rtc-hibernate
Merge into: lp:cdts
Diff against target: 213 lines (+27/-6)
13 files modified
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-audio.whitelist (+2/-1)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-bluetooth.whitelist (+1/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-camera.whitelist (+1/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-ethernet.whitelist (+4/-1)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware-advanced.whitelist (+2/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware.whitelist (+1/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-graphics.whitelist (+1/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mediacard.whitelist (+1/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mobile-broadband.whitelist (+1/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-system-integration.whitelist (+5/-2)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-touch.whitelist (+2/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-usb.whitelist (+1/-0)
plainbox-provider-canonical-driver-test-suite/whitelists/ihv-wireless.whitelist (+5/-2)
To merge this branch: bzr merge lp:~roadmr/cdts/fix-rtc-hibernate
Reviewer Review Type Date Requested Status
Chris Gregan (community) Approve
Review via email: mp+235009@code.launchpad.net

Commit message

Updated whitelists to ensure power-management/rtc runs before hibernate

Description of the change

Updated whitelists to ensure power-management/rtc runs before hibernate

To post a comment you must log in.
Revision history for this message
Chris Gregan (cgregan) wrote :

Nice and easy. Thunderbirds are go!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-audio.whitelist'
2--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-audio.whitelist 2014-07-31 19:31:59 +0000
3+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-audio.whitelist 2014-09-17 15:57:06 +0000
4@@ -42,4 +42,5 @@
5 audio/alsa_record_playback_automated_after_suspend_30_cycles
6 audio/check_volume_after_suspend_30_cycles
7 audio/audio_after_suspend_30_cycles
8-
9+__info__
10+info/buildstamp
11
12=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-bluetooth.whitelist'
13--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-bluetooth.whitelist 2014-08-27 16:46:21 +0000
14+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-bluetooth.whitelist 2014-09-17 15:57:06 +0000
15@@ -22,6 +22,7 @@
16 udev_attachment
17 lsmod_attachment
18 acpi_sleep_attachment
19+info/buildstamp
20 installer_debug.gz
21 __bluetooth__
22 bluetooth/detect-output
23
24=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-camera.whitelist'
25--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-camera.whitelist 2014-07-31 19:32:05 +0000
26+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-camera.whitelist 2014-09-17 15:57:06 +0000
27@@ -22,6 +22,7 @@
28 udev_attachment
29 lsmod_attachment
30 acpi_sleep_attachment
31+info/buildstamp
32 info/hdparm
33 info/hdparm_.*.txt
34 installer_debug.gz
35
36=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-ethernet.whitelist'
37--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-ethernet.whitelist 2014-07-31 19:31:59 +0000
38+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-ethernet.whitelist 2014-09-17 15:57:06 +0000
39@@ -22,6 +22,7 @@
40 udev_attachment
41 lsmod_attachment
42 acpi_sleep_attachment
43+info/buildstamp
44 info/hdparm
45 info/hdparm_.*.txt
46 installer_debug.gz
47@@ -35,6 +36,9 @@
48 __ethernet__
49 __stress__
50
51+# Must run before hibernate_advanced.
52+power-management/rtc
53+
54 # Manual tests and dependencies
55 ethernet/detect
56 networking/info
57@@ -46,7 +50,6 @@
58 benchmarks/network/network-loopback
59 ethernet/info_automated
60 networking/gateway_ping
61-power-management/rtc
62 suspend/iperf_before_suspend_ether_auto
63 suspend/iperf_before_suspend_ether_auto.*
64 suspend/suspend_advanced
65
66=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware-advanced.whitelist'
67--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware-advanced.whitelist 2014-08-15 20:34:00 +0000
68+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware-advanced.whitelist 2014-09-17 15:57:06 +0000
69@@ -79,3 +79,5 @@
70 suspend/suspend_advanced_auto
71 __hibernate__
72 power-management/hibernate_advanced
73+__info__
74+info/buildstamp
75
76=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware.whitelist'
77--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware.whitelist 2014-08-13 17:10:44 +0000
78+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-firmware.whitelist 2014-09-17 15:57:06 +0000
79@@ -22,6 +22,7 @@
80 udev_attachment
81 lsmod_attachment
82 acpi_sleep_attachment
83+info/buildstamp
84 info/hdparm
85 info/hdparm_.*.txt
86 installer_debug.gz
87
88=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-graphics.whitelist'
89--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-graphics.whitelist 2014-08-23 01:18:48 +0000
90+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-graphics.whitelist 2014-09-17 15:57:06 +0000
91@@ -26,6 +26,7 @@
92 gcov_attachment
93 lsmod_attachment
94 acpi_sleep_attachment
95+info/buildstamp
96 info/hdparm
97 installer_debug.gz
98 info/touchpad_driver
99
100=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mediacard.whitelist'
101--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mediacard.whitelist 2014-07-31 19:31:59 +0000
102+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mediacard.whitelist 2014-09-17 15:57:06 +0000
103@@ -22,6 +22,7 @@
104 udev_attachment
105 lsmod_attachment
106 acpi_sleep_attachment
107+info/buildstamp
108 info/hdparm
109 info/hdparm_.*.txt
110 installer_debug.gz
111
112=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mobile-broadband.whitelist'
113--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mobile-broadband.whitelist 2014-07-31 19:32:05 +0000
114+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-mobile-broadband.whitelist 2014-09-17 15:57:06 +0000
115@@ -22,6 +22,7 @@
116 udev_attachment
117 lsmod_attachment
118 acpi_sleep_attachment
119+info/buildstamp
120 installer_debug.gz
121 info/disk_partitions
122 info/mobile_broadband_info
123
124=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-system-integration.whitelist'
125--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-system-integration.whitelist 2014-07-31 19:32:06 +0000
126+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-system-integration.whitelist 2014-09-17 15:57:06 +0000
127@@ -22,11 +22,15 @@
128 udev_attachment
129 lsmod_attachment
130 acpi_sleep_attachment
131+info/buildstamp
132 info/hdparm
133 info/hdparm_.*.txt
134 installer_debug.gz
135 info/touchpad_driver
136 info/disk_partitions
137+# rtc test must run early
138+__power-management__
139+power-management/rtc
140 __cpu__
141 cpu/scaling_test
142 cpu/scaling_test-log-attach
143@@ -96,7 +100,7 @@
144 optical/dvd_playback
145 optical/bluray-read
146 optical/bluray-write
147-__power-management__
148+# Power management jobs (see category near the top)
149 power-management/shutdown-boot
150 power-management/fwts_wakealarm
151 power-management/fwts_wakealarm-log-attach
152@@ -107,7 +111,6 @@
153 power-management/lid
154 power-management/lid_close
155 power-management/lid_open
156-power-management/rtc
157 power-management/tickless_idle
158 power-management/unplug_ac
159 power-management/battery_drain_idle
160
161=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-touch.whitelist'
162--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-touch.whitelist 2014-07-31 19:32:05 +0000
163+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-touch.whitelist 2014-09-17 15:57:06 +0000
164@@ -32,3 +32,5 @@
165 touchpad/multitouch-rightclick
166 touchpad/multitouch-horizontal
167 touchpad/multitouch-vertical
168+__info__
169+info/buildstamp
170
171=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-usb.whitelist'
172--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-usb.whitelist 2014-08-29 12:10:02 +0000
173+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-usb.whitelist 2014-09-17 15:57:06 +0000
174@@ -21,6 +21,7 @@
175 udev_resource_attachment
176 lsmod_attachment
177 acpi_sleep_attachment
178+info/buildstamp
179 info/hdparm
180 info/hdparm_.*.txt
181 installer_debug.gz
182
183=== modified file 'plainbox-provider-canonical-driver-test-suite/whitelists/ihv-wireless.whitelist'
184--- plainbox-provider-canonical-driver-test-suite/whitelists/ihv-wireless.whitelist 2014-07-31 19:31:59 +0000
185+++ plainbox-provider-canonical-driver-test-suite/whitelists/ihv-wireless.whitelist 2014-09-17 15:57:06 +0000
186@@ -22,6 +22,7 @@
187 udev_attachment
188 lsmod_attachment
189 acpi_sleep_attachment
190+info/buildstamp
191 info/hdparm
192 info/hdparm_.*.txt
193 installer_debug.gz
194@@ -33,7 +34,10 @@
195 __power-management__
196 __suspend__
197 __wireless__
198-
199+
200+# Must run before hibernate
201+power-management/rtc
202+
203 # Manual tests and dependencies
204 networking/info
205 networking/info.*
206@@ -45,7 +49,6 @@
207 power-management/hibernate_advanced
208 # Automated tests
209 benchmarks/network/network-loopback
210-power-management/rtc
211 wireless/wireless_extension
212 suspend/wireless_before_suspend
213 wireless/wireless_connection_wpa_bg

Subscribers

People subscribed via source and target branches