From c083b4167ad37677a0bd214f8d58c6a6a42289ae Mon Sep 17 00:00:00 2001
From: "cgregan@canonical.com" <>
Date: Tue, 8 Apr 2014 14:33:44 -0400
Subject: addition of after suspend camera tests

---
 jobs/suspend.txt.in | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 7f0ab8a..d62c156 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -2022,3 +2022,48 @@ _description:
      1. Tap an object on the screen with finger. The cursor should jump to location tapped and object should highlight
  VERIFICATION:
      Does tap recognition work?
+
+plugin: user-verify
+id: camera/display_after_suspend
+estimated_duration: 120.0
+depends: camera/detect
+requires:
+ device.category == 'CAPTURE'
+command: camera_test display
+_description:
+ PURPOSE:
+     This test will check that the built-in camera works
+ STEPS:
+     1. Click on Test to display a video capture from the camera for ten seconds.
+ VERIFICATION:
+     Did you see the video capture?
+
+plugin: user-verify
+id: camera/still_after_suspend
+estimated_duration: 120.0
+depends: camera/detect
+requires:
+ package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
+ package.name == 'eog'
+ package.name == 'fswebcam' or package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
+ device.category == 'CAPTURE'
+command: camera_test still
+_description:
+ PURPOSE:
+     This test will check that the built-in camera works
+ STEPS:
+     1. Click on Test to display a still image from the camera for ten seconds.
+ VERIFICATION:
+     Did you see the image?
+
+plugin: shell
+id: camera/multiple_resolution_after_suspend
+estimated_duration: 1.2
+depends: camera/detect
+requires:
+ package.name == 'fswebcam' or package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
+ device.category == 'CAPTURE'
+command: camera_test resolutions
+_description:
+  Takes multiple pictures based on the resolutions supported by the camera and
+  validates their size and that they are of a valid format.
-- 
cgit v1.2.3


From d82fd0c1aea4ea2571cbda37c3896ba2d78e2b2d Mon Sep 17 00:00:00 2001
From: "cgregan@canonical.com" <>
Date: Wed, 9 Apr 2014 10:34:53 -0400
Subject: updated based on comments

---
 jobs/suspend.txt.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index d62c156..66615a8 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -2026,13 +2026,13 @@ _description:
 plugin: user-verify
 id: camera/display_after_suspend
 estimated_duration: 120.0
-depends: camera/detect
+depends: suspend/suspend_advanced
 requires:
  device.category == 'CAPTURE'
 command: camera_test display
 _description:
  PURPOSE:
-     This test will check that the built-in camera works
+     This test will check that the built-in camera works after suspend
  STEPS:
      1. Click on Test to display a video capture from the camera for ten seconds.
  VERIFICATION:
@@ -2041,7 +2041,7 @@ _description:
 plugin: user-verify
 id: camera/still_after_suspend
 estimated_duration: 120.0
-depends: camera/detect
+depends: camera/display_after_suspend
 requires:
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  package.name == 'eog'
@@ -2050,7 +2050,7 @@ requires:
 command: camera_test still
 _description:
  PURPOSE:
-     This test will check that the built-in camera works
+     This test will check that the built-in camera works after suspend
  STEPS:
      1. Click on Test to display a still image from the camera for ten seconds.
  VERIFICATION:
@@ -2059,11 +2059,11 @@ _description:
 plugin: shell
 id: camera/multiple_resolution_after_suspend
 estimated_duration: 1.2
-depends: camera/detect
+depends: camera/still_after_suspend
 requires:
  package.name == 'fswebcam' or package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  device.category == 'CAPTURE'
 command: camera_test resolutions
 _description:
   Takes multiple pictures based on the resolutions supported by the camera and
-  validates their size and that they are of a valid format.
+  validates their size and that they are of a valid format after suspend
-- 
cgit v1.2.3