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

Proposed by Betty Lin
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 894245484e583777503dcdfaf4722444e17f5e00
Merged at revision: ac256d99faeecd5f45f80ebc75c486a388ddeed1
Proposed branch: ~bettyl/plainbox-provider-checkbox:add-after-suspend-camera
Merge into: plainbox-provider-checkbox:master
Diff against target: 20 lines (+2/-0)
1 file modified
units/camera/jobs.pxu (+2/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+368698@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

LGTM, thanks for the fix

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/units/camera/jobs.pxu b/units/camera/jobs.pxu
index b1e4b9c..0605d18 100644
--- a/units/camera/jobs.pxu
+++ b/units/camera/jobs.pxu
@@ -15,6 +15,7 @@ template-unit: job
15plugin: user-interact-verify15plugin: user-interact-verify
16category_id: com.canonical.plainbox::camera16category_id: com.canonical.plainbox::camera
17id: camera/display_{name}17id: camera/display_{name}
18flags: also-after-suspend-manual
18_summary: Webcam video display test for {product_slug}19_summary: Webcam video display test for {product_slug}
19estimated_duration: 120.020estimated_duration: 120.0
20depends: camera/detect21depends: camera/detect
@@ -57,6 +58,7 @@ plugin: user-interact-verify
57template-engine: jinja258template-engine: jinja2
58category_id: com.canonical.plainbox::camera59category_id: com.canonical.plainbox::camera
59id: camera/still_{{ name }}60id: camera/still_{{ name }}
61flags: also-after-suspend-manual
60_summary: Webcam still image capture test for {{ product_slug }}62_summary: Webcam still image capture test for {{ product_slug }}
61estimated_duration: 120.063estimated_duration: 120.0
62depends: camera/detect64depends: camera/detect

Subscribers

People subscribed via source and target branches