Merge ~pieq/plainbox-provider-certification-client:remove-manual-suspend-job-deps into plainbox-provider-certification-client:master

[Pierre Equoy]

See commit description for more information.

Note that this requires this MR[1] to be merged.

Tested by calling the culprit test plans before and after applying this modification:

$ checkbox-cli list-bootstrapped com.canonical.certification::client-cert-desktop-hwe-sru > client-cert-desktop-hwe-sru-list-bootstrapped-BEFORE.log
$ checkbox-cli list-bootstrapped com.canonical.certification::client-cert-desktop-n+1 > client-cert-desktop-n+1-list-bootstrapped-BEFORE.log
$ checkbox-cli list-bootstrapped com.canonical.certification::client-cert-desktop-regression > client-cert-desktop-regression-list-bootstrapped-BEFORE.log

(Apply modification in this commit...)

$ checkbox-cli list-bootstrapped com.canonical.certification::client-cert-desktop-hwe-sru > client-cert-desktop-hwe-sru-list-bootstrapped-AFTER.log
$ checkbox-cli list-bootstrapped com.canonical.certification::client-cert-desktop-n+1 > client-cert-desktop-n+1-list-bootstrapped-AFTER.log
$ checkbox-cli list-bootstrapped com.canonical.certification::client-cert-desktop-regression > client-cert-desktop-regression-list-bootstrapped-AFTER.log

Then comparing the output using a diff tool (Meld).

In all these cases, the only modification is that there is no longer a call to the manual suspend job. The automated suspend job is called, as expected.

[1] https://code.launchpad.net/~pieq/plainbox-provider-checkbox/+git/plainbox-provider-checkbox/+merge/411995

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/units/client-cert-desktop-hwe-sru.pxu b/units/client-cert-desktop-hwe-sru.pxu
index aaf3139..af105df 100644
--- a/units/client-cert-desktop-hwe-sru.pxu
+++ b/units/client-cert-desktop-hwe-sru.pxu
@@ -93,7 +93,6 @@ include:
     # tell the user to just do nothing.
     graphics/1_switch_card_.*                              certification-status=blocker
     suspend/resolution_before_suspend                      certification-status=blocker
-    suspend/suspend_advanced                               certification-status=blocker
     suspend/resolution_after_suspend                       certification-status=blocker
     suspend/display_after_suspend                          certification-status=blocker
     suspend/cycle_resolutions_after_suspend                certification-status=blocker
diff --git a/units/client-cert-desktop-n+1.pxu b/units/client-cert-desktop-n+1.pxu
index a4421f1..c5e572e 100644
--- a/units/client-cert-desktop-n+1.pxu
+++ b/units/client-cert-desktop-n+1.pxu
@@ -165,7 +165,6 @@ include:
     # of checkbox.
     graphics/1_switch_card_.*                              certification-status=blocker
     suspend/resolution_before_suspend                      certification-status=blocker
-    suspend/suspend_advanced                               certification-status=blocker
     suspend/suspend-time-check                             certification-status=non-blocker
     suspend/suspend-single-log-attach
     power-management/lid                                   certification-status=blocker
diff --git a/units/client-cert-desktop-regression.pxu b/units/client-cert-desktop-regression.pxu
index 4883eed..ea36e28 100644
--- a/units/client-cert-desktop-regression.pxu
+++ b/units/client-cert-desktop-regression.pxu
@@ -62,7 +62,6 @@ include:
     usb/storage-automated
     usb/remove
     wireless/wireless_scanning
-    suspend/suspend_advanced
     suspend/suspend-time-check
     suspend/suspend-single-log-attach
     suspend/hybrid_sleep