Import plainbox-provider-checkbox_0.43.0.orig.tar.gzupstream-0.43.0patched-0.43.0-1

3 files changed, 91 insertions, 41 deletions

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 261a527..08bc7b3 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -87,7 +87,7 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_screen_resolution_{product_slug}
 requires:
 device.category == 'VIDEO'
- package.name == 'qmlscene'
+ executable.name == 'qmlscene'
 command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
 estimated_duration: 10.0
 _summary: Test default resolution for {vendor} {product}
@@ -240,7 +240,7 @@ id: graphics/{index}_rotation_{product_slug}
 depends: graphics/xorg-version
 command:
 source graphics_env {driver} {index}
- rotation_test_using_dbus
+ rotation_test
 estimated_duration: 20.000
 _summary: Test rotation for {vendor} {product}
 _description:
@@ -283,7 +283,7 @@ template-filter: graphics_card.driver in ['amdgpu', 'amdgpu-pro']
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_valid_opengl_renderer_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxinfo'
 command:
 renderer=`DRI_PRIME=1 glxinfo | grep "OpenGL re"`
 echo $renderer
@@ -298,7 +298,7 @@ template-resource: graphics_card
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_glxgears_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command:
 source graphics_env {driver} {index}
 glxgears
@@ -319,7 +319,7 @@ template-resource: graphics_card
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_glxgears_fullscreen_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command:
 source graphics_env {driver} {index}
 glxgears -fullscreen
@@ -340,7 +340,7 @@ template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_3d_window_open_close_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t open-close -i 10
 estimated_duration: 60.525
 _description: Open and close a 3D window multiple times on the {vendor} {product} video card
@@ -351,7 +351,7 @@ template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_3d_window_suspend_resume_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 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 {vendor} {product} video card
@@ -362,7 +362,7 @@ template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_multi_3d_windows_open_close_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 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 {vendor} {product} video card
@@ -374,8 +374,8 @@ plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_3d_window_move_{product_slug}
 requires:
- package.name == 'mesa-utils'
- package.name == 'wmctrl'
+ executable.name == 'glxgears'
+ executable.name == 'wmctrl'
 command: window_test -t move
 estimated_duration: 50.000
 _description: Move a 3D window around the screen on the {vendor} {product} video card
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index 5e8fe82..74153cc 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -47,7 +47,7 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/screen-resolution
 requires:
 device.category == 'VIDEO'
- package.name == 'qmlscene'
+ executable.name == 'qmlscene'
 command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
 estimated_duration: 10.0
 _summary: Test default resolution
@@ -174,7 +174,7 @@ _summary: Test Unity 3D support
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/glxgears
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: glxgears; true
 _summary: Test that glxgears works
 _description:
@@ -190,7 +190,7 @@ _description:
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/3d_window_open_close
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t open-close -i 10
 estimated_duration: 60.525
 _summary: Test 3D window open/close
@@ -199,7 +199,7 @@ _description: Open and close a 3D window multiple times
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/3d_window_suspend_resume
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t suspend-resume -i 10
 estimated_duration: 121.00
 _description: Open, suspend resume and close a 3D window multiple times
@@ -208,7 +208,7 @@ _summary: Test a 3D window with suspend/resume
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/multi_3d_windows_open_close
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t open-close-multi -i 10 -w 4
 estimated_duration: 60.000
 _description: Open and close 4 3D windows multiple times
@@ -217,7 +217,7 @@ _summary: Test Multi 3D window open/close
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/3d_window_move
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t move
 estimated_duration: 50.000
 _description: Move a 3D window around the screen
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index a85b194..9c1f294 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -1,42 +1,88 @@
 id: graphics-integrated-gpu-cert-full
 unit: test plan
 _name: Graphics tests (integrated GPU)
-_description: Graphics tests (integrated GPU)
+_description:
+ Graphics tests (integrated GPU)
 include:
- miscellanea/chvt
- graphics/xorg-version certification-status=blocker
- graphics/xorg-failsafe certification-status=blocker
- graphics/xorg-process certification-status=blocker
- graphics/VESA_drivers_not_in_use certification-status=blocker
- graphics/1_maximum_resolution_.* certification-status=blocker
- graphics/1_glxgears_.* certification-status=blocker
- graphics/1_driver_version_.* certification-status=blocker
- graphics/1_compiz_check_.* certification-status=blocker
- graphics/1_rotation_.* certification-status=blocker
- graphics/1_video_.* certification-status=blocker
- graphics/1_minimum_resolution_.*
- graphics/1_cycle_resolution_.* certification-status=non-blocker
+bootstrap_include:
+ graphics_card
+nested_part:
+ com.canonical.certification::graphics-integrated-gpu-cert-manual
+ com.canonical.certification::graphics-integrated-gpu-cert-automated
+
+id: graphics-integrated-gpu-cert-manual
+unit: test plan
+_name: Graphics tests (integrated GPU) (Manual)
+_description:
+ Graphics tests (integrated GPU) (Manual)
+include:
+ miscellanea/chvt
+ graphics/1_maximum_resolution_.* certification-status=blocker
+ graphics/1_glxgears_.* certification-status=blocker
+ graphics/1_rotation_.* certification-status=blocker
+ graphics/1_video_.* certification-status=blocker
+ graphics/1_cycle_resolution_.* certification-status=non-blocker
+bootstrap_include:
+ graphics_card
+
+id: graphics-integrated-gpu-cert-automated
+unit: test plan
+_name: Graphics tests (integrated GPU) (Automated)
+_description:
+ Graphics tests (integrated GPU) (Automated)
+include:
+ graphics/xorg-version certification-status=blocker
+ graphics/xorg-failsafe certification-status=blocker
+ graphics/xorg-process certification-status=blocker
+ graphics/VESA_drivers_not_in_use certification-status=blocker
+ graphics/1_driver_version_.* certification-status=blocker
+ graphics/1_compiz_check_.* certification-status=blocker
+ graphics/1_minimum_resolution_.*
 bootstrap_include:
 graphics_card
 
+
 id: graphics-discrete-gpu-cert-full
 unit: test plan
 _name: Graphics tests (discrete GPU)
-_description: Graphics tests (discrete GPU)
+_description:
+ Graphics tests (discrete GPU)
 include:
- graphics/2_switch_card_.*_xenial certification-status=blocker
- graphics/2_maximum_resolution_.* certification-status=blocker
- graphics/2_valid_opengl_renderer_.* certification-status=blocker
- graphics/2_glxgears_.* certification-status=blocker
- graphics/2_driver_version_.* certification-status=blocker
- graphics/2_compiz_check_.* certification-status=blocker
- graphics/2_rotation_.* certification-status=blocker
- graphics/2_video_.* certification-status=blocker
- graphics/2_minimum_resolution_.*
- graphics/2_cycle_resolution_.* certification-status=non-blocker
+bootstrap_include:
+ graphics_card
+nested_part:
+ com.canonical.certification::graphics-discrete-gpu-cert-manual
+ com.canonical.certification::graphics-discrete-gpu-cert-automated
+
+id: graphics-discrete-gpu-cert-manual
+unit: test plan
+_name: Graphics tests (discrete GPU) (Manual)
+_description:
+ Graphics tests (discrete GPU) (Manual)
+include:
+ graphics/2_switch_card_.*_xenial certification-status=blocker
+ graphics/2_maximum_resolution_.* certification-status=blocker
+ graphics/2_glxgears_.* certification-status=blocker
+ graphics/2_rotation_.* certification-status=blocker
+ graphics/2_video_.* certification-status=blocker
+ graphics/2_cycle_resolution_.* certification-status=non-blocker
 bootstrap_include:
 graphics_card
 
+id: graphics-discrete-gpu-cert-automated
+unit: test plan
+_name: Graphics tests (discrete GPU) (Automated)
+_description:
+ Graphics tests (discrete GPU) (Automated)
+include:
+ graphics/2_valid_opengl_renderer_.* certification-status=blocker
+ graphics/2_driver_version_.* certification-status=blocker
+ graphics/2_compiz_check_.* certification-status=blocker
+ graphics/2_minimum_resolution_.*
+bootstrap_include:
+ graphics_card
+
+
 id: after-suspend-graphics-integrated-gpu-cert-full
 unit: test plan
 _name: After suspend tests (integrated GPU)
@@ -58,6 +104,7 @@ include:
 suspend/1_video_after_suspend_.*_xenial certification-status=blocker
 suspend/1_cycle_resolutions_after_suspend_.*_xenial certification-status=non-blocker
 suspend/1_xrandr_screens_after_suspend.tar.gz_xenial
+ after-suspend-manual-monitor/1_dim_brightness_.* certification-status=blocker
 
 id: after-suspend-graphics-discrete-gpu-cert-full
 unit: test plan
@@ -76,6 +123,7 @@ include:
 suspend/2_video_after_suspend_.*_xenial certification-status=blocker
 suspend/2_cycle_resolutions_after_suspend_.*_xenial certification-status=non-blocker
 suspend/2_xrandr_screens_after_suspend_.*.tar.gz_xenial
+ after-suspend-manual-monitor/2_dim_brightness_.* certification-status=blocker
 
 id: graphics-integrated-gpu-cert-blockers
 unit: test plan
@@ -128,6 +176,7 @@ include:
 suspend/1_display_after_suspend_.*_xenial certification-status=blocker
 suspend/1_glxgears_after_suspend_.*_xenial certification-status=blocker
 suspend/1_video_after_suspend_.*_xenial certification-status=blocker
+ after-suspend-manual-monitor/1_dim_brightness_.* certification-status=blocker
 
 id: after-suspend-graphics-discrete-gpu-cert-blockers
 unit: test plan
@@ -142,3 +191,4 @@ include:
 suspend/2_display_after_suspend_.*_xenial certification-status=blocker
 suspend/2_glxgears_after_suspend_.*_xenial certification-status=blocker
 suspend/2_video_after_suspend_.*_xenial certification-status=blocker
+ after-suspend-manual-monitor/2_dim_brightness_.* certification-status=blocker