Merge ~bettyl/plainbox-provider-checkbox:add-after-suspend-dvd into plainbox-provider-checkbox:master

[Betty Lin]

Confirm the modification can work by the following check:

u@u-HP-ZBook-17-G5:~$ checkbox-cli list-bootstrapped com.canonical.certification::client-cert-18-04 | grep optical
com.canonical.certification::optical/read_sr0
com.canonical.certification::optical_drive_sr0
com.canonical.certification::optical/bluray-read_sr0
com.canonical.certification::optical/detect
com.canonical.certification::after-suspend-manual-optical/read_sr0
com.canonical.certification::after-suspend-manual-optical/bluray-read_sr0

[Maciej Kisielewski (kissiel)]

One question below.

review: Needs Information

[Betty Lin (bettyl)]

@Maciej

I refer to some test plans for the content of "after-suspend-xxx-cert-full", for example: Audio, touchpad ...etc.
I think this update should be corresponded with others.

review: Needs Resubmitting

[Maciej Kisielewski (kissiel)]

LGTM, +1

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[bionic] [03:11:35] starting container
Device project added to bionic-testing
[xenial] [03:11:37] starting container
Device project added to xenial-testing
[bionic] [03:11:49] provisioning container
[xenial] [03:11:49] provisioning container
[bionic] [03:11:56] Unable to provision requirements in container!
[bionic] output: https://paste.ubuntu.com/p/WvFfYpHhB9/
[bionic] [03:11:59] Fixing file permissions in source directory
[bionic] Destroying failed container to reclaim resources
[xenial] [03:12:11] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-checkbox
[xenial] [03:13:52] container-tests-provider-checkbox: PASS
[xenial] [03:13:52] Fixing file permissions in source directory
[xenial] [03:13:52] Destroying container

review: Needs Fixing

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[bionic] [07:57:17] starting container
[xenial] [07:57:18] starting container
Device project added to bionic-testing
Device project added to xenial-testing
[xenial] [07:57:28] provisioning container
[bionic] [07:57:30] provisioning container
[bionic] [07:57:37] Unable to provision requirements in container!
[bionic] output: https://paste.ubuntu.com/p/jGb9f3jTfk/
[bionic] [07:57:39] Fixing file permissions in source directory
[bionic] Destroying failed container to reclaim resources
[xenial] [07:57:52] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-checkbox
[xenial] [08:00:23] container-tests-provider-checkbox: PASS
[xenial] [08:00:23] Fixing file permissions in source directory
[xenial] [08:00:23] Destroying container

review: Needs Fixing

diff --git a/units/optical/jobs.pxu b/units/optical/jobs.pxu
index 707c02d..53a2877 100644
--- a/units/optical/jobs.pxu
+++ b/units/optical/jobs.pxu
@@ -16,6 +16,7 @@ id: optical/read_{name}
 estimated_duration: 120.0
 user: root
 command: optical_read_test /dev/{name}
+flags: also-after-suspend-manual
 _description:
  PURPOSE:
      This test will check your {product} device's ability to read CD media
@@ -164,6 +165,7 @@ requires:
  optical_drive_{name}.bd_read == "supported"
 user: root
 command: optical_read_test /dev/{name}
+flags: also-after-suspend-manual
 _description:
  PURPOSE:
   This test will check your {product} device's ability to read Blu-Ray (BD) media
diff --git a/units/optical/test-plan.pxu b/units/optical/test-plan.pxu
index 2e53d79..f927f00 100644
--- a/units/optical/test-plan.pxu
+++ b/units/optical/test-plan.pxu
@@ -31,6 +31,17 @@ include:
 bootstrap_include:
     device
 
+id: after-suspend-optical-cert-full
+unit: test plan
+_name: Optical drive tests (after suspend)
+_description:
+ Optical drive tests (after suspend)
+include:
+    optical/detect                                                      certification-status=blocker
+    after-suspend-manual-optical/read_.*                                certification-status=blocker
+    after-suspend-manual-optical/bluray-read_.*                         certification-status=blocker
+bootstrap_include:
+    device
 
 id: optical-cert-blockers
 unit: test plan
@@ -42,3 +53,15 @@ include:
     optical/bluray-read_.*                         certification-status=blocker
 bootstrap_include:
     device
+
+id: after-suspend-optical-cert-blockers
+unit: test plan
+_name: Optical drive tests (certification blockers only)
+_description: Optical drive tests (certification blockers only)
+include:
+    optical/detect                                                      certification-status=blocker
+    after-suspend-manual-optical/read_.*                                certification-status=blocker
+    after-suspend-manual-optical/bluray-read_.*                         certification-status=blocker
+bootstrap_include:
+    device
+