Merge lp:~cypressyew/checkbox/display-rename into lp:checkbox

[Po-Hsu Lin]

Change the job name of graphic/display to graphic/video, to avoid future job name collision with suspend/display_after_suspend

I use the following command to check in which whitelist this test has been used:
find ./ -name "*" | xargs grep "graphics/.*display"

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu'
--- providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu	2015-05-14 06:40:17 +0000
+++ providers/plainbox-provider-certification-client/units/client-cert-14-04.pxu	2015-05-18 06:30:53 +0000
@@ -102,7 +102,7 @@
     graphics/1_driver_version_.*                           certification-status=blocker
     graphics/1_compiz_check_.*                             certification-status=blocker
     graphics/1_rotation_.*                                 certification-status=blocker
-    graphics/1_display_.*                                  certification-status=blocker
+    graphics/1_video_.*                                    certification-status=blocker
     graphics/1_minimum_resolution_.*
     graphics/1_cycle_resolution_.*
     graphics/2_switch_card_.*                              certification-status=blocker
@@ -111,7 +111,7 @@
     graphics/2_driver_version_.*                           certification-status=blocker
     graphics/2_compiz_check_.*                             certification-status=blocker
     graphics/2_rotation_.*                                 certification-status=blocker
-    graphics/2_display_.*                                  certification-status=blocker
+    graphics/2_video_.*                                    certification-status=blocker
     graphics/2_minimum_resolution_.*
     graphics/2_cycle_resolution_.*
     monitor/2_powersaving_.*                               certification-status=blocker

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-cert-12-04-4.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-cert-12-04-4.whitelist	2014-11-21 07:18:17 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-cert-12-04-4.whitelist	2015-05-18 06:30:53 +0000
@@ -80,7 +80,7 @@
 graphics/driver_version
 graphics/compiz_check
 graphics/rotation
-graphics/display
+graphics/video
 graphics/minimum_resolution
 graphics/xorg-failsafe
 graphics/xorg-process

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist	2015-05-14 19:32:33 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-cert.whitelist	2015-05-18 06:30:53 +0000
@@ -115,7 +115,7 @@
 graphics/1_driver_version_.*
 graphics/1_compiz_check_.*
 graphics/1_rotation_.*
-graphics/1_display_.*
+graphics/1_video_.*
 graphics/1_minimum_resolution_.*
 graphics/1_cycle_resolution_.*
 graphics/2_switch_card_.*
@@ -124,7 +124,7 @@
 graphics/2_driver_version_.*
 graphics/2_compiz_check_.*
 graphics/2_rotation_.*
-graphics/2_display_.*
+graphics/2_video_.*
 graphics/2_minimum_resolution_.*
 graphics/2_cycle_resolution_.*
 monitor/2_powersaving_.*

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-selftest-12-04-4.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-selftest-12-04-4.whitelist	2014-11-21 07:18:17 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-selftest-12-04-4.whitelist	2015-05-18 06:30:53 +0000
@@ -77,7 +77,7 @@
 graphics/driver_version
 graphics/compiz_check
 graphics/rotation
-graphics/display
+graphics/video
 graphics/minimum_resolution
 graphics/xorg-failsafe
 graphics/xorg-process

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-selftest-14-04.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-selftest-14-04.whitelist	2015-05-14 19:32:33 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-selftest-14-04.whitelist	2015-05-18 06:30:53 +0000
@@ -84,7 +84,7 @@
 graphics/1_driver_version_.*
 graphics/1_compiz_check_.*
 graphics/1_rotation_.*
-graphics/1_display_.*
+graphics/1_video_.*
 graphics/1_minimum_resolution_.*
 graphics/xorg-failsafe
 graphics/xorg-process
@@ -96,7 +96,7 @@
 graphics/2_driver_version_.*
 graphics/2_compiz_check_.*
 graphics/2_rotation_.*
-graphics/2_display_.*
+graphics/2_video_.*
 graphics/2_minimum_resolution_.*
 graphics/2_cycle_resolution_.*
 __hibernate__

=== modified file 'providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist'
--- providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist	2015-05-14 19:32:33 +0000
+++ providers/plainbox-provider-certification-client/whitelists/client-selftest.whitelist	2015-05-18 06:30:53 +0000
@@ -84,7 +84,7 @@
 graphics/1_driver_version_.*
 graphics/1_compiz_check_.*
 graphics/1_rotation_.*
-graphics/1_display_.*
+graphics/1_video_.*
 graphics/1_minimum_resolution_.*
 graphics/xorg-failsafe
 graphics/xorg-process
@@ -96,7 +96,7 @@
 graphics/2_driver_version_.*
 graphics/2_compiz_check_.*
 graphics/2_rotation_.*
-graphics/2_display_.*
+graphics/2_video_.*
 graphics/2_minimum_resolution_.*
 graphics/2_cycle_resolution_.*
 __hibernate__

=== modified file 'providers/plainbox-provider-checkbox/jobs/graphics.txt.in'
--- providers/plainbox-provider-checkbox/jobs/graphics.txt.in	2015-04-28 06:43:55 +0000
+++ providers/plainbox-provider-checkbox/jobs/graphics.txt.in	2015-05-18 06:30:53 +0000
@@ -221,14 +221,14 @@
  _summary: Test graphic memory info for $product.
  EOF
 
-id: graphics/generator_display
+id: graphics/generator_video
 requires: device.category == 'VIDEO'
-_description: Display test
-_summary: Display test
+_description: Display video test
+_summary: Display video test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
- id: graphics/`echo ${index}`_display_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ id: graphics/`echo ${index}`_video_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  plugin: user-interact-verify
  requires:
   package.name == 'xorg'
@@ -237,7 +237,7 @@
  _summary: Test that video can be displayed with ${product}
  _description:
   PURPOSE:
-      This test will test the default display
+      This test will test the default display with a sample video
   STEPS:
       1. Click "Test" to display a video test.
   VERIFICATION:

=== modified file 'providers/plainbox-provider-checkbox/whitelists/default.whitelist'
--- providers/plainbox-provider-checkbox/whitelists/default.whitelist	2014-04-25 22:38:44 +0000
+++ providers/plainbox-provider-checkbox/whitelists/default.whitelist	2015-05-18 06:30:53 +0000
@@ -49,7 +49,7 @@
 __graphics__
 graphics/generator_.*
 graphics/1_compiz_check.*
-graphics/display
+graphics/video
 graphics/1_resolution.*
 graphics/1_minimum_resolution.*
 graphics/1_driver_version.*