Merge #373818 from ~sylvain-pineau/plainbox-provider-checkbox:fix-1832171

5 files changed, 26 insertions, 49 deletions

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 01ec380c..89b5a00f 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -254,28 +254,14 @@ _description:
 
 unit: template
 template-resource: graphics_card
-template-filter: graphics_card.prime_gpu_offload == 'Off'
-plugin: shell
-category_id: com.canonical.plainbox::graphics
-id: graphics/{index}_compiz_check_{product_slug}
-requires: package.name == 'nux-tools'
-command:
- source graphics_env {driver} {index}
- ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
-estimated_duration: 0.130
-_description: Check that {vendor} {product} hardware is able to run compiz
-_summary: Test Compiz support for {vendor} {product}
-
-unit: template
-template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
-id: graphics/{index}_unity_support_{product_slug}
+id: graphics/{index}_gl_support_{product_slug}
 requires: package.name == 'nux-tools'
 command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
 estimated_duration: 0.131
-_description: Check that {vendor} {product} hardware is able to run Unity 3D
-_summary: Test Unity 3D support for {vendor} {product}
+_description: Check that {vendor} {product} hardware is able to run a desktop session (OpenGL)
+_summary: Test OpenGL support for {vendor} {product}
 
 unit: template
 template-resource: graphics_card
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index 74153ccb..6f18e02e 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -155,21 +155,12 @@ _description:
 
 plugin: shell
 category_id: com.canonical.plainbox::graphics
-id: graphics/compiz_check
-requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
-estimated_duration: 0.130
-_summary: Test Compiz support
-_description: Check that hardware is able to run compiz
-
-plugin: shell
-category_id: com.canonical.plainbox::graphics
-id: graphics/unity-support
+id: graphics/gl_support
 requires: package.name == 'nux-tools'
 command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
 estimated_duration: 0.131
-_description: Check that hardware is able to run Unity 3D
-_summary: Test Unity 3D support
+_description: Check that hardware is able to run a desktop session (OpenGL)
+_summary: Test OpenGL support
 
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index 4b8c7ecc..19072096 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -37,7 +37,7 @@ include:
 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_gl_support_.* certification-status=blocker
 graphics/1_minimum_resolution_.*
 suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
 bootstrap_include:
@@ -79,7 +79,7 @@ include:
 graphics/2_auto_switch_card_.* certification-status=blocker
 graphics/2_valid_opengl_renderer_.* certification-status=blocker
 graphics/2_driver_version_.* certification-status=blocker
- graphics/2_compiz_check_.* certification-status=blocker
+ graphics/2_gl_support_.* certification-status=blocker
 graphics/2_minimum_resolution_.*
 suspend/2_resolution_before_suspend_.*_auto certification-status=blocker
 bootstrap_include:
@@ -107,7 +107,7 @@ include:
 # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs)
 suspend/1_suspend-time-check_.*_auto certification-status=non-blocker
 suspend/1_suspend-single-log-attach_.*_auto certification-status=non-blocker
- suspend/1_compiz_check_after_suspend_.*_auto certification-status=blocker
+ suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/1_resolution_after_suspend_.*_auto certification-status=blocker
 
@@ -146,7 +146,7 @@ include:
 suspend/2_suspend_after_switch_to_card_.*_auto certification-status=blocker
 suspend/2_suspend-time-check_.*_auto certification-status=non-blocker
 suspend/2_suspend-single-log-attach_.*_auto certification-status=non-blocker
- suspend/2_compiz_check_after_suspend_.*_auto certification-status=blocker
+ suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/2_resolution_after_suspend_.*_auto certification-status=blocker
 
@@ -174,7 +174,7 @@ include:
 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_gl_support_.* certification-status=blocker
 graphics/1_rotation_.* certification-status=blocker
 graphics/1_video_.* certification-status=blocker
 suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
@@ -191,7 +191,7 @@ include:
 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_gl_support_.* certification-status=blocker
 graphics/2_rotation_.* certification-status=blocker
 graphics/2_video_.* certification-status=blocker
 bootstrap_include:
@@ -207,7 +207,7 @@ include:
 power-management/lid certification-status=blocker
 power-management/lid_close certification-status=blocker
 power-management/lid_open certification-status=blocker
- suspend/1_compiz_check_after_suspend_.*_auto certification-status=blocker
+ suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/1_resolution_after_suspend_.*_auto certification-status=blocker
 suspend/1_display_after_suspend_.*_graphics certification-status=blocker
@@ -221,7 +221,7 @@ _description: After suspend tests (discrete GPU, certification blockers only)
 include:
 suspend/2_resolution_before_suspend_.*_auto certification-status=blocker
 suspend/2_suspend_after_switch_to_card_.*_graphics certification-status=blocker
- suspend/2_compiz_check_after_suspend_.*_auto certification-status=blocker
+ suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
 suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker
 suspend/2_resolution_after_suspend_.*_auto certification-status=blocker
 suspend/2_display_after_suspend_.*_graphics certification-status=blocker
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index d4fe9235..21effcc1 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -115,7 +115,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
 template-engine: jinja2
 plugin: shell
 category_id: com.canonical.plainbox::suspend
-id: suspend/{{ index }}_compiz_check_after_suspend_{{ product_slug }}_auto
+id: suspend/{{ index }}_gl_support_after_suspend_{{ product_slug }}_auto
 depends:
 {%- if gpu_count > "1" %}
 suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
@@ -125,10 +125,10 @@ depends:
 requires: package.name == 'nux-tools'
 command:
 source graphics_env {{ driver }} {{ index }}
- ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+ ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
 estimated_duration: 0.130
-_description: Check that {{ product }} hardware is able to run compiz after suspend
-_summary: Test Compiz support for {{ product }} after suspend
+_description: Check that {{ product }} hardware is able to run a desktop session (OpenGL)
+_summary: Test OpenGL support for {{ product }} after suspend
 
 unit: template
 template-resource: graphics_card
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 35ba417c..5d9bf084 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -2120,23 +2120,23 @@ template-resource: graphics_card
 template-filter: graphics_card.prime_gpu_offload == 'Off'
 plugin: shell
 category_id: com.canonical.plainbox::suspend
-id: suspend/{index}_compiz_check_after_suspend_{product_slug}
+id: suspend/{index}_gl_support_after_suspend_{product_slug}
 depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
 requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
 estimated_duration: 0.130
-_description: Check that {product} hardware is able to run compiz after suspend
-_summary: Test Compiz support for {product} after suspend
+_description: Check that {product} hardware is able to run a desktop session (OpenGL) after suspend
+_summary: Test OpenGL support for {product} after suspend
 
 plugin: shell
 category_id: com.canonical.plainbox::suspend
-id: suspend/compiz_check_after_suspend
+id: suspend/gl_support_after_suspend
 depends: suspend/suspend_advanced
 requires: package.name == 'nux-tools'
-command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
 estimated_duration: 0.130
-_description: Check that the hardware is able to run compiz after suspend
-_summary: Test Compiz support after suspend
+_description: Check that the hardware is able to run a desktop session (OpenGL)
+_summary: Test OpenGL support after suspend
 
 unit: template
 template-resource: graphics_card