Merge lp:~brendan-donegan/checkbox/graphics_screenshot_gpu_lockup_0.12 into lp:checkbox/0.12

[Brendan Donegan]

This merge request backports the necessary jobs to allow the graphics screenshot and gpu_lockup tests to be run in Oneiric SRUs

[lp:~brendan-donegan/checkbox/graphics_screenshot_gpu_lockup_0.12]

1118. By Brendan Donegan on 2012-05-18

Remove gpu_lockup test as it's not ready for primetime and add in the screenshot_after_suspend test.

1119. By Brendan Donegan on 2012-05-18

Corrected debian/changelog

[Daniel Manrique (roadmr)]

The code looks good and since it's just test definitions, I guess chances of it failing for unknown reasons are slim. Merging.. thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-01 04:19:29 +0000
+++ debian/changelog	2012-05-18 15:49:21 +0000
@@ -1,5 +1,9 @@
 checkbox (0.12.12) oneiric; urgency=low
  
+  [Brendan Donegan]
+  * Backported graphics screenshot and tests to be used in the SRU
+    test suite.
+
   [Jeff Lane]
   *  Backported changes to checkbox/parsers/udevadm.py that resolved issue with
      disk tests not being run against local hard drives (LP: #925582)

=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2011-08-10 13:14:40 +0000
+++ jobs/graphics.txt.in	2012-05-18 15:49:21 +0000
@@ -141,3 +141,42 @@
  Select Test to execute glxgears to ensure that minimal 3d graphics support is in place.
  .
  Did the 3d animation appear?
+ 
+plugin: shell
+name: graphics/screenshot
+requires: package.name == 'fswebcam'
+command: camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
+_description:
+ PURPOSE:
+     Take a screengrab of the current screen (logged on Unity desktop)
+ STEPS:
+     1. Take picture using USB webcam
+ VERIFICATION:
+     1. Review attachment manually later
+
+plugin: attachment
+name: screenshot.jpg
+depends: graphics/screenshot
+command: cat ${CHECKBOX_DATA}/screenshot.jpg
+_description: Attaches the screenshot captured in graphics/screenshot.
+
+plugin: shell
+name: graphics/screenshot_fullscreen_video
+requires: package.name == 'fswebcam'
+command:
+ gst_pipeline_test -t 20 -f "playbin2 uri=file://${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv" &
+ sleep 15 && camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
+_description:
+ PURPOSE:
+     Take a screengrab of the current screen during fullscreen video playback
+ STEPS:
+     1. Start a fullscreen video playback
+     2. Take picture using USB webcam after a few seconds
+ VERIFICATION:
+     1. Review attachment manually later
+
+plugin: attachment
+name: screenshot_fullscreen_video.jpg
+depends: graphics/screenshot_fullscreen_video
+command: cat ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg
+_description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-03-22 08:08:56 +0000
+++ jobs/suspend.txt.in	2012-05-18 15:49:21 +0000
@@ -271,3 +271,21 @@
 user: root
 command: wake_on_lan_test ${WAKE_ON_LAN_URL} --debug
 
+plugin: shell
+name: suspend/screenshot_after_suspend
+depends: suspend/suspend_advanced_auto
+requires: package.name == 'fswebcam'
+command: camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
+_description:
+ PURPOSE:
+     Take a screengrab of the current screen after suspend (logged on Unity desktop)
+ STEPS:
+     1. Take picture using USB webcam
+ VERIFICATION:
+     1. Review attachment manually later
+
+plugin: attachment
+name: screenshot_after_suspend.jpg
+depends: suspend/screenshot_after_suspend
+command: cat ${CHECKBOX_DATA}/screenshot_after_suspend.jpg
+_description: Attaches the screenshot captured in graphics/screenshot.