Provider for Plainbox - Canonical Certification (Legacy)

Merge ~cypressyew/plainbox-provider-canonical-certification:fix-hibernate into plainbox-provider-canonical-certification:master-client

  1. Git
  2. lp:~cypressyew/plainbox-provider-canonical-certification
  3. fix-hibernate
  4. Merge into master-client
Proposed by Po-Hsu Lin
Status: Merged
Approved by: Po-Hsu Lin
Approved revision: f558052ea459dbacb9008398610edf7ca2311a5a
Merged at revision: bc47763be3d879639e0bad7f98499957df56b93b
Proposed branch: ~cypressyew/plainbox-provider-canonical-certification:fix-hibernate
Merge into: plainbox-provider-canonical-certification:master-client
Diff against target: 45 lines (+6/-6)
3 files modified
units/client-cert-14-04-3.pxu (+2/-2)
whitelists/client-cert.whitelist (+2/-2)
whitelists/client-selftest.whitelist (+2/-2)
Reviewer Review Type Date Requested Status
Po-Hsu Lin Approve
Review via email: mp+273774@code.launchpad.net

Description of the change

Use the dedicated hibernate_advanced job for S4, so it won't be triggered in the middle of automated tests

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Self approving it, so that I can work on the whitelist -> test plan transition.

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

I will try to merge this branch. I will keep you posted

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

The branch has been merged as requested. Thank you for your contribution

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/client-cert-14-04-3.pxu b/units/client-cert-14-04-3.pxu
2index 47eed69..4a30419 100644
3--- a/units/client-cert-14-04-3.pxu
4+++ b/units/client-cert-14-04-3.pxu
5@@ -356,8 +356,8 @@ include:
6 suspend/wireless_connection_after_suspend_open_n certification-status=blocker
7 suspend/wireless_connection_after_suspend_wpa_ac certification-status=blocker
8 suspend/wireless_connection_after_suspend_open_ac certification-status=blocker
9- power-management/1_hibernate_advanced_.* certification-status=non-blocker
10- power-management/1_hibernate-single-log-attach_.*
11+ power-management/hibernate_advanced certification-status=non-blocker
12+ power-management/hibernate-single-log-attach
13 keys/hibernate certification-status=blocker
14 # The following tests should run BEFORE the automated tests. The reboot and
15 # power off tests will also give us a clean system to start the stress run
16diff --git a/whitelists/client-cert.whitelist b/whitelists/client-cert.whitelist
17index eb10b74..6cdd265 100644
18--- a/whitelists/client-cert.whitelist
19+++ b/whitelists/client-cert.whitelist
20@@ -360,8 +360,8 @@ suspend/wireless_connection_after_suspend_wpa_n
21 suspend/wireless_connection_after_suspend_open_n
22 suspend/wireless_connection_after_suspend_wpa_ac
23 suspend/wireless_connection_after_suspend_open_ac
24-power-management/1_hibernate_advanced_.*
25-power-management/1_hibernate-single-log-attach_.*
26+power-management/hibernate_advanced
27+power-management/hibernate-single-log-attach
28 keys/hibernate
29 # The following tests should run BEFORE the automated tests. The reboot and
30 # power off tests will also give us a clean system to start the stress run
31diff --git a/whitelists/client-selftest.whitelist b/whitelists/client-selftest.whitelist
32index 6d05ff0..8a1f816 100644
33--- a/whitelists/client-selftest.whitelist
34+++ b/whitelists/client-selftest.whitelist
35@@ -367,8 +367,8 @@ suspend/wireless_connection_after_suspend_wpa_n_manual
36 suspend/wireless_connection_after_suspend_open_n_manual
37 suspend/wireless_connection_after_suspend_wpa_ac_manual
38 suspend/wireless_connection_after_suspend_open_ac_manual
39-power-management/1_hibernate_advanced_.*
40-power-management/1_hibernate-single-log-attach_.*
41+power-management/hibernate_advanced
42+power-management/hibernate-single-log-attach
43 keys/hibernate
44 # The following tests should run BEFORE the automated tests. The reboot and
45 # power off tests will also give us a clean system to start the stress run

Subscribers

People subscribed via source and target branches