From 083f2026c11c67135e2041f5779054d5cfa41953 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 13:47:32 -0400
Subject: providers:checkbox: renamed resolution-change generator job to comply
 with new convention

---
 jobs/graphics.txt.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index ce8f503..735b0ba 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -11,15 +11,17 @@ command: xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
 estimated_duration: 0.018
 _description: Test to output the Xorg version
 
-id: graphics/resolution-change
+id: graphics/generator_resolution-change
 requires: device.category == 'VIDEO'
 _description: Resolution change tests
+_summary: Resolution change tests
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: user-interact-verify
  id: graphics/`echo ${index}`_resolution-change_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  depends: graphics/xorg-version
+ _summary: Test changing resolution for $product
  _description:
   PURPOSE:
       This test will verify that the GUI is usable after manually changing resolution on the $product graphics card.
-- 
cgit v1.2.3


From d3ed9f2441e8014412bbecad540f4ac077d58619 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:30:50 -0400
Subject: providers:checkbox: converted resolution job (default resolution)

---
 jobs/graphics.txt.in | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 735b0ba..97b30b3 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -52,21 +52,30 @@ command: ! test -e /var/log/Xorg.failsafe.log
 estimated_duration: 0.030
 _description: Test that the X is not running in failsafe mode.
 
-plugin: user-verify
-id: graphics/resolution
-requires:
- device.category == 'VIDEO'
-command: resolution_test
-estimated_duration: 0.750
-_description:
- PURPOSE:
-     This test will verify the default display resolution
- STEPS:
-     1. This display is using the following resolution:
- INFO:
-     $output
- VERIFICATION:
-     Is this acceptable for your display?
+id: graphics/generator_resolution
+requires: device.category == 'VIDEO'
+_description: Default resolution tests
+_summary: Default resolution tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-verify
+ id: graphics/`echo ${index}`_resolution_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires:
+  device.category == 'VIDEO'
+ command: resolution_test
+ estimated_duration: 0.750
+ _summary: Test default resolution for $product
+ _description:
+  PURPOSE:
+      This test will verify the default display resolution on the $product graphics card.
+  STEPS:
+      1. This display is using the following resolution:
+  INFO:
+      Resolution: $output
+  VERIFICATION:
+      Is this acceptable for your display on $product graphics card?
+ EOF
 
 plugin: user-verify
 id: graphics/screen-resolution
-- 
cgit v1.2.3


From cd73d94b09054f632e1b1202d674a08a7f2414c3 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:30:50 -0400
Subject: providers:checkbox: converted screen-resolution

---
 jobs/graphics.txt.in | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 97b30b3..e752b40 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -77,20 +77,29 @@ command:
       Is this acceptable for your display on $product graphics card?
  EOF
 
-plugin: user-verify
-id: graphics/screen-resolution
-requires:
- device.category == 'VIDEO'
- package.name == 'qmlscene'
-command: timeout 5 qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
-estimated_duration: 10.0
-_description:
- PURPOSE:
-     This test will verify the default display resolution
- STEPS:
-     1. Click on Test to display the screen resolution overlay for 5 seconds.
- VERIFICATION:
-     Is this acceptable for your display?
+id: graphics/generator_screen_resolution
+requires: device.category == 'VIDEO'
+_description: Default resolution tests
+_summary: Default resolution tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-verify
+ id: graphics/`echo ${index}`_screen_resolution_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires:
+  device.category == 'VIDEO'
+  package.name == 'qmlscene'
+ command: timeout 5 qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
+ estimated_duration: 10.0
+ _summary: Test default resolution for $product
+ _description:
+  PURPOSE:
+      This test will verify the default display resolution on the $product graphics card
+  STEPS:
+      1. Click on Test to display the screen resolution overlay for 5 seconds.
+  VERIFICATION:
+      Is this acceptable for your display on the $product graphics card?
+ EOF
 
 plugin: shell
 id: graphics/minimum_resolution
-- 
cgit v1.2.3


From 2a19b2a09c9cfb22d7a3ca7fe3f3c0acccffc2d8 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:30:50 -0400
Subject: providers:checkbox: converted minimum_resolution

---
 jobs/graphics.txt.in | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index e752b40..56eca0e 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -101,17 +101,24 @@ command:
       Is this acceptable for your display on the $product graphics card?
  EOF
 
-plugin: shell
-id: graphics/minimum_resolution
-requires:
- device.category == 'VIDEO'
-command: resolution_test --horizontal 800 --vertical 600
-estimated_duration: 0.331
-_description:
- Ensure the current resolution meets or exceeds the recommended minimum
- resolution (800x600). See here for details:
- .
- https://help.ubuntu.com/community/Installation/SystemRequirements
+id: graphics/generator_minimum_resolution
+requires: device.category == 'VIDEO'
+_description: Minimum resolution tests
+_summary: Minimum resolution tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_minimum_resolution_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires:
+  device.category == 'VIDEO'
+ command: resolution_test --horizontal 800 --vertical 600
+ estimated_duration: 0.331
+ _summary: Test that $product meets minimum resolution requirement
+ _description:
+  Ensure the current resolution meets or exceeds the recommended minimum
+  resolution (800x600) on the $product graphics card. See here for details:
+  https://help.ubuntu.com/community/Installation/SystemRequirements
 
 id: graphics/maximum_resolution
 requires: device.category == 'VIDEO'
-- 
cgit v1.2.3


From c940964db18058cd84d07a94c113359af1e7dd0c Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:30:50 -0400
Subject: providers:checkbox: converted maximum_resolution test and a bunch of
 small shell tests

---
 jobs/graphics.txt.in | 92 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 65 insertions(+), 27 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 56eca0e..96d785c 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -119,57 +119,95 @@ command:
   Ensure the current resolution meets or exceeds the recommended minimum
   resolution (800x600) on the $product graphics card. See here for details:
   https://help.ubuntu.com/community/Installation/SystemRequirements
+ EOF
 
-id: graphics/maximum_resolution
+id: graphics/generator_maximum_resolution
 requires: device.category == 'VIDEO'
 _description: Maximum resolution tests
-estimated_duration: 0.10
+_summary: Maximum resolution tests
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: graphics/`echo ${index}`_maximum_resolution_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  plugin: user-verify
- id: graphics/`echo $index`_maximum_resolution_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  requires:
   device.category == 'VIDEO'
   package.name == 'zenity'
  command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
  estimated_duration: 10.0
+ _summary: Test maximum resolution for $product
  _description:
   PURPOSE:
-      This test will verify the display is operating at its maximum supported resolution on the $product graphics card. 
+    This test will verify the display is operating at its maximum supported resolution on the $product graphics card. 
   STEPS:
-      1. Select the $product graphics card (a reboot may be necessary)
-      2. Consult the system's specifications and locate the screen's maximum supported resolution.
-      3. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
+    1. Select the $product graphics card (a reboot may be necessary)
+    2. Consult the system's specifications and locate the screen's maximum supported resolution.
+    3. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
   VERIFICATION:
-      Is this the maximum resolution for the display connected to the $product graphics card?
+    Is this the maximum resolution for the display connected to the $product graphics card?
  EOF
 
-id: graphics/modes
-plugin: shell
-command: graphics_modes_info
-estimated_duration: 0.250
-_description: Collect info on graphics modes (screen resolution and refresh rate)
+id: graphics/generator_modes
+requires: device.category == 'VIDEO'
+_description: Mode tests
+_summary: Mode tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: graphics/`echo ${index}`_modes_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: shell
+ command: graphics_modes_info
+ estimated_duration: 0.250
+ _description: Collect info on graphics modes (screen resolution and refresh rate) for $product
+ _summary: Test graphic modes info for $product
+ EOF
 
-id: graphics/color_depth
-plugin: shell
-command: color_depth_info
-estimated_duration: 0.150
-_description: Collect info on color depth and pixel format.
+id: graphics/generator_color_depth
+requires: device.category == 'VIDEO'
+_description: Color depth tests
+_summary: Color depth tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: graphics/`echo ${index}`_color_depth_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: shell
+ command: color_depth_info
+ estimated_duration: 0.150
+ _description: Collect info on color depth and pixel format for $product
+ _summary: Test color depth info for $product
+ EOF
 
-id: graphics/fresh_rate
-plugin: shell
-command: fresh_rate_info
-_description: Collect info on fresh rate.
+id: graphics/generator_fresh_rate
+requires: device.category == 'VIDEO'
+_description: Refresh rate tests
+_summary: Refresh rate tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: graphics/`echo ${index}`_fresh_rate_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: shell
+ command: fresh_rate_info
+ _description: Collect info on fresh rate for $product.
+ _summary: Test refresh rate for $product
+ EOF
 
-id: graphics/graphic_memory
-plugin: shell
-command: graphic_memory_info
-_description: Collect info on graphic memory.
+id: graphics/generator_graphic_memory
+requires: device.category == 'VIDEO'
+_description: Graphic memory tests
+_summary: Graphic memory tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: graphics/`echo ${index}`_graphic_memory_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: shell
+ command: graphic_memory_info
+ _description: Collect info on graphic memory for $product.
+ _summary: Test graphic memory info for $product.
+ EOF
 
 plugin: user-verify
 id: graphics/display
-requires: 
+requires:
  package.name == 'xorg'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 command: gst_pipeline_test -t 2 'videotestsrc ! videoconvert ! autovideosink' || gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! autovideosink' 
-- 
cgit v1.2.3


From 6e64b966e4f4930f4e707489b32565876061bb60 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:30:50 -0400
Subject: providers:checkbox: converted cycle_resolution

---
 jobs/graphics.txt.in | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 96d785c..f153673 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -225,19 +225,28 @@ command: cat /var/log/Xorg.0.log | perl -e '$a=0;while(<>){$a++ if /Loading.*ves
 estimated_duration: 0.011
 _description: Check that VESA drivers are not in use
 
-plugin: user-verify
-id: graphics/cycle_resolution
-requires: package.name == 'xorg'
-depends: graphics/VESA_drivers_not_in_use
-command: xrandr_cycle --screenshot-dir $PLAINBOX_SESSION_SHARE
-estimated_duration: 250.000
-_description:
- PURPOSE:
-     This test cycles through the detected video modes
- STEPS:
-     1. Click "Test" to start cycling through the video modes
- VERIFICATION:
-     Did the screen appear to be working for each mode?
+id: graphics/generator_cycle_resolution
+requires: device.category == 'VIDEO'
+_description: Resolution cycling tests
+_summary: Resolution cycling tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-verify
+ id: graphics/`echo ${index}`_cycle_resolution_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'xorg'
+ depends: graphics/VESA_drivers_not_in_use
+ command: xrandr_cycle --screenshot-dir $PLAINBOX_SESSION_SHARE
+ estimated_duration: 250.000
+ _summary: Test resolution cycling for $product
+ _description:
+  PURPOSE:
+      This test cycles through the detected video modes for the $product graphics card
+  STEPS:
+      1. Click "Test" to start cycling through the video modes
+  VERIFICATION:
+      Did the screen appear to be working for each mode?
+ EOF
 
 plugin: user-verify
 id: graphics/rotation
-- 
cgit v1.2.3


From 37202602e7b76262a4cf7bbba54030f5b539b91c Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:30:50 -0400
Subject: providers:checkbox: converted rotation test

---
 jobs/graphics.txt.in | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index f153673..f1b4348 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -248,19 +248,28 @@ command:
       Did the screen appear to be working for each mode?
  EOF
 
-plugin: user-verify
-id: graphics/rotation
-depends: graphics/xorg-version
-command: rotation_test
-estimated_duration: 20.000
-_description:
- PURPOSE:
-     This test will test display rotation
- STEPS:
-     1. Click "Test" to test display rotation. The display will be rotated every 4 seconds.
-     2. Check if all rotations (normal right inverted left) took place without permanent screen corruption
- VERIFICATION:
-     Did the display rotation take place without without permanent screen corruption?
+id: graphics/generator_rotation
+requires: device.category == 'VIDEO'
+_description: Rotation tests
+_summary: Rotation tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-verify
+ id: graphics/`echo ${index}`_rotation_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: graphics/xorg-version
+ command: rotation_test
+ estimated_duration: 20.000
+ _summary: Test rotation for $product
+ _description:
+  PURPOSE:
+      This test will test display rotation on the $product graphics card
+  STEPS:
+      1. Click "Test" to test display rotation. The display will be rotated every 4 seconds.
+      2. Check if all rotations (normal right inverted left) took place without permanent screen corruption
+  VERIFICATION:
+      Did the display rotation take place without without permanent screen corruption?
+ EOF
 
 plugin: shell
 id: graphics/compiz_check
-- 
cgit v1.2.3


From 556cde1e02e11a6307aa6bceeafa4dc964de880a Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:43 -0400
Subject: providers:checkbox: converted compiz and unity support tests

---
 jobs/graphics.txt.in | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index f1b4348..e35048a 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -271,19 +271,37 @@ command:
       Did the display rotation take place without without permanent screen corruption?
  EOF
 
-plugin: shell
-id: graphics/compiz_check
-requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -c -p | ansi_parser | grep ":\(\s\+\)no$"
-estimated_duration: 0.130
-_description: Check that hardware is able to run compiz
+id: graphics/generator_compiz_check
+requires: device.category == 'VIDEO'
+_description: Compiz support tests
+_summary: Compiz support tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_compiz_check_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'nux-tools'
+ command: ! /usr/lib/nux/unity_support_test -c -p | ansi_parser | grep ":\(\s\+\)no$"
+ estimated_duration: 0.130
+ _description: Check that $product hardware is able to run compiz
+ _summary: Test Compiz support for $product
+ EOF
 
-plugin: shell
-id: graphics/unity-support
-requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -p | ansi_parser | grep ":\(\s\+\)no"
-estimated_duration: 0.131
-_description: Check that hardware is able to run Unity 3D
+id: graphics/generator_unity_support
+requires: device.category == 'VIDEO'
+_description: Unity support tests
+_summary: Unity support tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_unity_support_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'nux-tools'
+ command: ! /usr/lib/nux/unity_support_test -p | ansi_parser | grep ":\(\s\+\)no"
+ estimated_duration: 0.131
+ _description: Check that $product hardware is able to run Unity 3D
+ _summary: Test Unity 3D support for $product
+ EOF
 
 plugin: user-verify
 id: graphics/glxgears
-- 
cgit v1.2.3


From 5bb01d3711df6aea13430491c9aadaeb50eeca70 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:43 -0400
Subject: providers:checkbox: convert glxgears test

---
 jobs/graphics.txt.in | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index e35048a..8dbc0ea 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -303,19 +303,28 @@ command:
  _summary: Test Unity 3D support for $product
  EOF
 
-plugin: user-verify
-id: graphics/glxgears
-requires: package.name == 'mesa-utils'
-command: glxgears; true
-_description:
- PURPOSE:
-     This test tests the basic 3D capabilities of your video card
- STEPS:
-     1. Click "Test" to execute an OpenGL demo. Press ESC at any time to close.
-     2. Verify that the animation is not jerky or slow.
- VERIFICATION:
-     1. Did the 3d animation appear?
-     2. Was the animation free from slowness/jerkiness?
+id: graphics/generator_glxgears
+requires: device.category == 'VIDEO'
+_description: glxgears tests
+_summary: glxgears tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-verify
+ id: graphics/`echo ${index}`_glxgears_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'mesa-utils'
+ command: glxgears; true
+ _summary: Test that glxgears works for $product
+ _description:
+  PURPOSE:
+      This test tests the basic 3D capabilities of your $product video card
+  STEPS:
+      1. Click "Test" to execute an OpenGL demo. Press ESC at any time to close.
+      2. Verify that the animation is not jerky or slow.
+  VERIFICATION:
+      1. Did the 3d animation appear?
+      2. Was the animation free from slowness/jerkiness?
+ EOF
 
 plugin: shell
 id: graphics/3d_window_open_close
-- 
cgit v1.2.3


From ebcde0c12058af6e109260625f28e8539056ac20 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:44 -0400
Subject: providers:checkbox: Converted a few small shell 3d window tests

---
 jobs/graphics.txt.in | 84 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 60 insertions(+), 24 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 8dbc0ea..04260c8 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -326,33 +326,69 @@ command:
       2. Was the animation free from slowness/jerkiness?
  EOF
 
-plugin: shell
-id: graphics/3d_window_open_close
-requires: package.name == 'mesa-utils'
-command: window_test -t open-close -i 10
-estimated_duration: 60.525
-_description: Open and close a 3D window multiple times
+id: graphics/generator_3d_window_open_close
+requires: device.category == 'VIDEO'
+_description: 3D window open/close tests
+_summary: 3D window open/close tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_3d_window_open_close_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'mesa-utils'
+ command: window_test -t open-close -i 10
+ estimated_duration: 60.525
+ _description: Open and close a 3D window multiple times on the $product video card
+ _summary: Test 3D window open/close for $product
+ EOF
 
-plugin: shell
-id: graphics/3d_window_suspend_resume
-requires: package.name == 'mesa-utils'
-command: window_test -t suspend-resume -i 10
-estimated_duration: 121.00
-_description: Open, suspend resume and close a 3D window multiple times
+id: graphics/generator_3d_window_suspend_resume
+requires: device.category == 'VIDEO'
+_description: 3D window with suspend/resume tests
+_summary: 3D window with suspend/resume tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_3d_window_suspend_resume_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'mesa-utils'
+ command: window_test -t suspend-resume -i 10
+ estimated_duration: 121.00
+ _description: Open, suspend resume and close a 3D window multiple times on the $product video card
+ _summary: Test a 3D window with suspend/resume for $product
+ EOF
 
-plugin: shell
-id: graphics/multi_3d_windows_open_close
-requires: package.name == 'mesa-utils'
-command: window_test -t open-close-multi -i 10 -w 4
-estimated_duration: 60.000
-_description: Open and close 4 3D windows multiple times
+id: graphics/generator_multi_3d_windows_open_close
+requires: device.category == 'VIDEO'
+_description: Multiple 3D window open/close
+_summary: Multiple 3D window open/close tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_multi_3d_windows_open_close_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'mesa-utils'
+ command: window_test -t open-close-multi -i 10 -w 4
+ estimated_duration: 60.000
+ _description: Open and close 4 3D windows multiple times on the $product video card
+ _summary: Test Multi 3D window open/close for $product
+ EOF
 
-plugin: shell
-id: graphics/3d_window_move
-requires: package.name == 'mesa-utils'
-command: window_test -t move
-estimated_duration: 50.000
-_description: Move a 3D window around the screen
+id: graphics/generator_3d_window_move
+requires: device.category == 'VIDEO'
+_description: 3D window movement
+_summary: 3D window movement tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_3d_window_move_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'mesa-utils'
+ command: window_test -t move
+ estimated_duration: 50.000
+ _description: Move a 3D window around the screen on the $product video card
+ _summary: Test 3D window movement for $product
+ EOF
 
 plugin: shell
 id: graphics/screenshot
-- 
cgit v1.2.3


From 135c5de242a7fd75ab61df8e3584ff5712c7344a Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:44 -0400
Subject: providers:checkbox: converted driver_version

---
 jobs/graphics.txt.in | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 04260c8..3208a20 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -1,8 +1,17 @@
-plugin: shell
-id: graphics/driver_version
-command: graphics_driver
-estimated_duration: 0.500
-_description: Parses Xorg.0.Log and discovers the running X driver and version
+id: graphics/generator_driver_version
+requires: device.category == 'VIDEO'
+_description: Driver version tests
+_summary: Driver version tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_driver_version_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ command: graphics_driver
+ estimated_duration: 0.500
+ _description: Parses Xorg.0.Log and discovers the running X driver and version for the $product graphics card
+ _summary: Test X driver/version for $product
+ EOF
 
 plugin: shell
 id: graphics/xorg-version
-- 
cgit v1.2.3


From 0cd60864dc02b980f0aa633c3a343b228efd42cf Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:44 -0400
Subject: providers:checkbox: converted screenshot and attachment

---
 jobs/graphics.txt.in | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 3208a20..a90ee98 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -399,23 +399,41 @@ command:
  _summary: Test 3D window movement for $product
  EOF
 
-plugin: shell
-id: graphics/screenshot
-requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/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:
-     Review attachment manually later
+id: graphics/generator_screenshot
+requires: device.category == 'VIDEO'
+_description: screenshot tests
+_summary: screenshot tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_screenshot_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'fswebcam'
+ command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_${index}.jpg -q 2>&1 | ansi_parser
+ _summary: Test grabbing a screenshot for $product
+ _description:
+  PURPOSE:
+      Take a screengrab of the current screen (logged on Unity desktop) as produced by the $product graphics card
+  STEPS:
+      1. Take picture using USB webcam
+  VERIFICATION:
+      Review attachment manually later
+ EOF
 
-plugin: attachment
-id: screenshot.jpg
-depends: graphics/screenshot
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
-_description: Attaches the screenshot captured in graphics/screenshot.
+id: graphics/generator_screenshot.jpg
+requires: device.category == 'VIDEO'
+_description: screenshot attachment tests
+_summary: screenshot attachment tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: attachment
+ id: `echo ${index}`_screenshot_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.jpg
+ depends: graphics/`echo ${index}`_screenshot_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_${index}.jpg
+ _description: Attaches the screenshot captured in graphics/screenshot for the $product graphics card.
+ _summary: Attach results of screenshot test for $product
+ EOF
 
 plugin: shell
 id: graphics/screenshot_fullscreen_video
-- 
cgit v1.2.3


From d1fba442c3aa300d5f558e6d5d9f69684f888735 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:44 -0400
Subject: providers:checkbox: converted full screen video screenshot and
 attachment

---
 jobs/graphics.txt.in | 64 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index a90ee98..c982742 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -435,31 +435,49 @@ command:
  _summary: Attach results of screenshot test for $product
  EOF
 
-plugin: shell
-id: graphics/screenshot_fullscreen_video
-requires: package.name == 'fswebcam'
+id: graphics/generator_screenshot_fullscreen_video
+requires: device.category == 'VIDEO'
+_description: full screen video screenshot tests
+_summary: full screen video screenshot tests
+plugin: local
 command:
- [ -f ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
- dbus-launch gsettings set org.gnome.totem repeat true
- totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null &
- set -o pipefail
- sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
- sleep 5 && totem --quit 2>/dev/null
- dbus-launch gsettings set org.gnome.totem repeat false
-_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:
-     Review attachment manually later
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: graphics/`echo ${index}`_screenshot_fullscreen_video_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: package.name == 'fswebcam'
+ command:
+  [ -f ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
+  dbus-launch gsettings set org.gnome.totem repeat true
+  totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null &
+  set -o pipefail
+  sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video_${index}.jpg -q 2>&1 | ansi_parser
+  sleep 5 && totem --quit 2>/dev/null
+  dbus-launch gsettings set org.gnome.totem repeat false
+ _summary: Test FSV screenshot for $product
+ _description:
+  PURPOSE:
+      Take a screengrab of the current screen during fullscreen video playback using the $product graphics card
+  STEPS:
+      1. Start a fullscreen video playback
+      2. Take picture using USB webcam after a few seconds
+  VERIFICATION:
+      Review attachment manually later
+ EOF
 
-plugin: attachment
-id: screenshot_fullscreen_video.jpg
-depends: graphics/screenshot_fullscreen_video
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
-_description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.
+id: graphics/generator_screenshot_fullscreen_video.jpg
+requires: device.category == 'VIDEO'
+_description: full screen video attachment tests
+_summary: full screen video attachment tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: attachment
+ id: `echo ${index}`_screenshot_fullscreen_video_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.jpg
+ depends: graphics/`echo ${index}`_screenshot_fullscreen_video_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video_${index}.jpg
+ _summary: Attach results of FSV screenshot test for $product
+ _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video for the $product graphics card
+ EOF
 
 plugin: shell
 id: graphics/screenshot_opencv_validation
-- 
cgit v1.2.3


From f9a55aaed13e5a4c605ded6d526fe85a34bdaa8e Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:44 -0400
Subject: providers:checkbox: update whitelists for graphics test reorg

---
 whitelists/autotesting.whitelist | 11 ++++++-----
 whitelists/default.whitelist     |  9 +++++----
 whitelists/sru.whitelist         | 11 ++++++-----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/whitelists/autotesting.whitelist b/whitelists/autotesting.whitelist
index 87ae61b..bbb7ffa 100644
--- a/whitelists/autotesting.whitelist
+++ b/whitelists/autotesting.whitelist
@@ -41,14 +41,15 @@ __disk__
 disk/read_performance
 disk/read_performance_.*
 __graphics__
+graphics/generator_.*
 graphics/xorg-version
-graphics/compiz_check
+graphics/1_compiz_check_.*
 graphics/xorg-failsafe
 graphics/xorg-process
-graphics/screenshot
-screenshot.jpg
-graphics/screenshot_fullscreen_video
-screenshot_fullscreen_video.jpg
+graphics/1_screenshot_.*
+1_screenshot_.*.jpg
+graphics/1_screenshot_fullscreen_video_.*
+1_screenshot_fullscreen_video_.*.jpg
 __install__
 install/apt-get-gets-updates
 __mediacard__
diff --git a/whitelists/default.whitelist b/whitelists/default.whitelist
index d9d653c..1ba9d9a 100644
--- a/whitelists/default.whitelist
+++ b/whitelists/default.whitelist
@@ -47,11 +47,12 @@ firewire/insert
 firewire/storage-test
 firewire/remove
 __graphics__
-graphics/compiz_check
+graphics/generator_.*
+graphics/1_compiz_check.*
 graphics/display
-graphics/resolution
-graphics/minimum_resolution
-graphics/driver_version
+graphics/1_resolution.*
+graphics/1_minimum_resolution.*
+graphics/1_driver_version.*
 graphics/VESA_drivers_not_in_use
 __input__
 input/keyboard
diff --git a/whitelists/sru.whitelist b/whitelists/sru.whitelist
index faff8e9..d0872a9 100644
--- a/whitelists/sru.whitelist
+++ b/whitelists/sru.whitelist
@@ -53,14 +53,15 @@ __disk__
 disk/read_performance
 disk/read_performance_.*
 __graphics__
+graphics/generator_.*
 graphics/xorg-version
-graphics/compiz_check
+graphics/1_compiz_check_.*
 graphics/xorg-failsafe
 graphics/xorg-process
-graphics/screenshot
-screenshot.jpg
-graphics/screenshot_fullscreen_video
-screenshot_fullscreen_video.jpg
+graphics/1_screenshot_.*
+1_screenshot_.*.jpg
+graphics/1_screenshot_fullscreen_video_.*
+1_screenshot_fullscreen_video_.*.jpg
 graphics/screenshot_opencv_validation
 screenshot_opencv_validation.jpg
 __install__
-- 
cgit v1.2.3


From 1b19b5a0f01caf948e04e5804e58fedcfc10dff7 Mon Sep 17 00:00:00 2001
From: Daniel Manrique <roadmr@ubuntu.com>
Date: Fri, 25 Apr 2014 18:38:44 -0400
Subject: providers:checkbox: All graphics jobs now have summaries.

Added summaries for:
xorg version
test x process
x failsafe
graphics display video
vesa not in use
opencv
---
 jobs/graphics.txt.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index c982742..9fde3af 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -19,6 +19,7 @@ requires: package.name == "x11-utils"
 command: xdpyinfo | grep "^X.Org version" | cut -d ':' -f 2 | tr -d ' '
 estimated_duration: 0.018
 _description: Test to output the Xorg version
+_summary: Test Xorg version
 
 id: graphics/generator_resolution-change
 requires: device.category == 'VIDEO'
@@ -53,6 +54,7 @@ requires:
 command: pgrep -f '/usr/bin/X' >/dev/null
 estimated_duration: 0.100
 _description: Test that the X process is running.
+_summary: Test that the X process is running.
 
 plugin: shell
 id: graphics/xorg-failsafe
@@ -60,6 +62,7 @@ requires: package.name == 'xorg'
 command: ! test -e /var/log/Xorg.failsafe.log
 estimated_duration: 0.030
 _description: Test that the X is not running in failsafe mode.
+_summary: Test that X is not in failsafe mode.
 
 id: graphics/generator_resolution
 requires: device.category == 'VIDEO'
@@ -220,6 +223,7 @@ requires:
  package.name == 'xorg'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 command: gst_pipeline_test -t 2 'videotestsrc ! videoconvert ! autovideosink' || gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! autovideosink' 
+_summary: Test that video can be displayed
 _description:
  PURPOSE:
      This test will test the default display
@@ -233,6 +237,7 @@ id: graphics/VESA_drivers_not_in_use
 command: cat /var/log/Xorg.0.log | perl -e '$a=0;while(<>){$a++ if /Loading.*vesa_drv\.so/;$a-- if /Unloading.*vesa/&&$a}exit 1 if $a'
 estimated_duration: 0.011
 _description: Check that VESA drivers are not in use
+_summary: Test that VESA drivers are not in use
 
 id: graphics/generator_cycle_resolution
 requires: device.category == 'VIDEO'
@@ -488,6 +493,7 @@ command:
     ${PLAINBOX_PROVIDER_DATA}/images/logo_Ubuntu_stacked_black.png \
     --device=${EXTERNAL_WEBCAM_DEVICE:-/dev/external_webcam} \
     -o ${PLAINBOX_SESSION_SHARE}/screenshot_opencv_validation.jpg
+_summary: Test that a screenshot is valid, automatically
 _description:
  Take a screengrab of the screen displaying a black and white Ubuntu logo.
  Check that the screenshot matches the original file using OpenCV ORB detection.
@@ -497,3 +503,4 @@ id: screenshot_opencv_validation.jpg
 depends: graphics/screenshot_opencv_validation
 command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_opencv_validation.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_opencv_validation.
+_summary: Attach the screenshot captured for the automatically validated screenshot test
-- 
cgit v1.2.3