Merge lp:~sylvain-pineau/checkbox/fix-1389253 into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Approved by: Ara Pulido
Approved revision: 3391
Merged at revision: 3388
Proposed branch: lp:~sylvain-pineau/checkbox/fix-1389253
Merge into: lp:checkbox
Diff against target: 120 lines (+21/-17)
6 files modified
.travis.yml (+3/-3)
providers/plainbox-provider-certification-client/whitelists/client-cert-12-04-4.whitelist (+1/-2)
providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist (+2/-5)
providers/plainbox-provider-certification-client/whitelists/client-selftest-12-04-4.whitelist (+1/-2)
providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist (+2/-5)
providers/plainbox-provider-checkbox/jobs/suspend.txt.in (+12/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/fix-1389253
Reviewer Review Type Date Requested Status
Ara Pulido (community) Approve
Zygmunt Krynicki (community) Approve
Review via email: mp+240818@code.launchpad.net

Description of the change

Fixes the linked bug (certification whitelists + checkbox jobs definition updates)

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

Looks good to me, thanks for using a trick to conver the spurious error into a harmless advice :-)

review: Approve
Revision history for this message
Ara Pulido (ara) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.travis.yml'
2--- .travis.yml 2014-11-04 15:23:33 +0000
3+++ .travis.yml 2014-11-06 08:36:03 +0000
4@@ -48,12 +48,12 @@
5 - python providers/plainbox-provider-checkbox/manage.py i18n
6 - python providers/plainbox-provider-certification-server/manage.py build
7 - python providers/plainbox-provider-certification-server/manage.py i18n
8+ - python providers/plainbox-provider-certification-client/manage.py build
9+ - python providers/plainbox-provider-certification-client/manage.py i18n
10 # Validate each provider
11 - python plainbox/plainbox/impl/providers/categories/manage.py validate -N
12 - python plainbox/plainbox/impl/providers/stubbox/manage.py validate -N
13 - python providers/plainbox-provider-resource-generic/manage.py validate -N
14 - python providers/plainbox-provider-checkbox/manage.py validate -N
15 - python providers/plainbox-provider-certification-server/manage.py validate -N
16- # TODO: enable this once this bug is fixed
17- # https://bugs.launchpad.net/plainbox-provider-canonical-certification/+bug/1389253
18- # - python providers/plainbox-provider-certification-client/manage.py validate -N
19+ - python providers/plainbox-provider-certification-client/manage.py validate -N
20
21=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-cert-12-04-4.whitelist'
22--- providers/plainbox-provider-certification-client/whitelists/client-cert-12-04-4.whitelist 2014-10-03 03:21:49 +0000
23+++ providers/plainbox-provider-certification-client/whitelists/client-cert-12-04-4.whitelist 2014-11-06 08:36:03 +0000
24@@ -182,8 +182,7 @@
25 usb3/insert
26 usb3/storage-automated
27 usb3/remove
28-usb/usb3_read_performance
29-usb/usb3_read_performance_.*
30+usb3/superspeed_performance
31 __wireless__
32 wireless/wireless_scanning
33 wireless/wireless_connection_wpa_bg
34
35=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist'
36--- providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist 2014-10-03 03:21:49 +0000
37+++ providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist 2014-11-06 08:36:03 +0000
38@@ -28,7 +28,6 @@
39 package
40 rtc
41 sleep
42-touchpad_scroll
43 uname
44 usb
45 xinput
46@@ -323,10 +322,8 @@
47 firmware/fwts_logs
48 firmware/fwts_desktop_diagnosis
49 firmware/fwts_desktop_diagnosis_results.log
50-firmware/fwts_wakealarm
51-firmware/fwts_wakealarm.log
52-firmware/fwts_uefirtvariable
53-firmware/fwts_uefirtvariable.log
54+firmware/fwts_wakealarm.*
55+firmware/fwts_uefirtvariable.*
56 benchmarks/disk/hdparm-read
57 benchmarks/disk/hdparm-read_.*
58 benchmarks/disk/hdparm-cache-read
59
60=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-selftest-12-04-4.whitelist'
61--- providers/plainbox-provider-certification-client/whitelists/client-selftest-12-04-4.whitelist 2014-10-03 03:21:49 +0000
62+++ providers/plainbox-provider-certification-client/whitelists/client-selftest-12-04-4.whitelist 2014-11-06 08:36:03 +0000
63@@ -182,8 +182,7 @@
64 usb3/insert
65 usb3/storage-automated
66 usb3/remove
67-usb/usb3_read_performance
68-usb/usb3_read_performance_.*
69+usb3/superspeed_performance
70 __wireless__
71 wireless/wireless_scanning
72 wireless/wireless_connection_wpa_bg
73
74=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist'
75--- providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist 2014-10-03 03:21:49 +0000
76+++ providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist 2014-11-06 08:36:03 +0000
77@@ -25,7 +25,6 @@
78 package
79 rtc
80 sleep
81-touchpad_scroll
82 uname
83 usb
84 xinput
85@@ -311,10 +310,8 @@
86 firmware/fwts_logs
87 firmware/fwts_desktop_diagnosis
88 firmware/fwts_desktop_diagnosis_results.log
89-firmware/fwts_wakealarm
90-firmware/fwts_wakealarm.log
91-firmware/fwts_uefirtvariable
92-firmware/fwts_uefirtvariable.log
93+firmware/fwts_wakealarm.*
94+firmware/fwts_uefirtvariable.*
95 benchmarks/disk/hdparm-read
96 benchmarks/disk/hdparm-read_.*
97 benchmarks/disk/hdparm-cache-read
98
99=== modified file 'providers/plainbox-provider-checkbox/jobs/suspend.txt.in'
100--- providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2014-09-30 21:23:47 +0000
101+++ providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2014-11-06 08:36:03 +0000
102@@ -460,6 +460,18 @@
103 Verify that all memory is available after resuming from suspend.
104 command: meminfo_resource | diff $PLAINBOX_SESSION_SHARE/meminfo_before_suspend -
105
106+plugin: manual
107+id: suspend/display_after_suspend
108+estimated_duration: 120.0
109+depends: suspend/suspend_advanced
110+_description:
111+ PURPOSE:
112+ This test will check that the display is correct after suspend and resume
113+ STEPS:
114+ 1. Check that your display does not show up visual artifacts after resuming.
115+ VERIFICATION:
116+ Does the display work normally after resuming from suspend?
117+
118 id: suspend/generator_display_after_suspend
119 requires: device.category == 'VIDEO'
120 _description: Display after suspend tests

Subscribers

People subscribed via source and target branches