Checkbox Provider - Base

Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1832171 into plainbox-provider-checkbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-checkbox
  3. fix-1832171
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: e4752926de684dff9d28d91449a17156988a8712
Merged at revision: b89db3f9329f9f2dc61298577571d964a67838cd
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:fix-1832171
Merge into: plainbox-provider-checkbox:master
Diff against target: 204 lines (+26/-49)
5 files modified
units/graphics/jobs.pxu (+3/-17)
units/graphics/legacy.pxu (+3/-12)
units/graphics/test-plan.pxu (+8/-8)
units/suspend/suspend-graphics.pxu (+4/-4)
units/suspend/suspend.pxu (+8/-8)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+373818@code.launchpad.net

Description of the change

Run /usr/lib/nux/unity_support_test w/o the compiz check, rename the corresponding test to gl_support and update the nested part to fix the linked bug

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
2index 01ec380..89b5a00 100644
3--- a/units/graphics/jobs.pxu
4+++ b/units/graphics/jobs.pxu
5@@ -254,28 +254,14 @@ _description:
6
7 unit: template
8 template-resource: graphics_card
9-template-filter: graphics_card.prime_gpu_offload == 'Off'
10-plugin: shell
11-category_id: com.canonical.plainbox::graphics
12-id: graphics/{index}_compiz_check_{product_slug}
13-requires: package.name == 'nux-tools'
14-command:
15- source graphics_env {driver} {index}
16- ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
17-estimated_duration: 0.130
18-_description: Check that {vendor} {product} hardware is able to run compiz
19-_summary: Test Compiz support for {vendor} {product}
20-
21-unit: template
22-template-resource: graphics_card
23 plugin: shell
24 category_id: com.canonical.plainbox::graphics
25-id: graphics/{index}_unity_support_{product_slug}
26+id: graphics/{index}_gl_support_{product_slug}
27 requires: package.name == 'nux-tools'
28 command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
29 estimated_duration: 0.131
30-_description: Check that {vendor} {product} hardware is able to run Unity 3D
31-_summary: Test Unity 3D support for {vendor} {product}
32+_description: Check that {vendor} {product} hardware is able to run a desktop session (OpenGL)
33+_summary: Test OpenGL support for {vendor} {product}
34
35 unit: template
36 template-resource: graphics_card
37diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
38index 74153cc..6f18e02 100644
39--- a/units/graphics/legacy.pxu
40+++ b/units/graphics/legacy.pxu
41@@ -155,21 +155,12 @@ _description:
42
43 plugin: shell
44 category_id: com.canonical.plainbox::graphics
45-id: graphics/compiz_check
46-requires: package.name == 'nux-tools'
47-command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
48-estimated_duration: 0.130
49-_summary: Test Compiz support
50-_description: Check that hardware is able to run compiz
51-
52-plugin: shell
53-category_id: com.canonical.plainbox::graphics
54-id: graphics/unity-support
55+id: graphics/gl_support
56 requires: package.name == 'nux-tools'
57 command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
58 estimated_duration: 0.131
59-_description: Check that hardware is able to run Unity 3D
60-_summary: Test Unity 3D support
61+_description: Check that hardware is able to run a desktop session (OpenGL)
62+_summary: Test OpenGL support
63
64 plugin: user-interact-verify
65 category_id: com.canonical.plainbox::graphics
66diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
67index 4b8c7ec..1907209 100644
68--- a/units/graphics/test-plan.pxu
69+++ b/units/graphics/test-plan.pxu
70@@ -37,7 +37,7 @@ include:
71 graphics/xorg-process certification-status=blocker
72 graphics/VESA_drivers_not_in_use certification-status=blocker
73 graphics/1_driver_version_.* certification-status=blocker
74- graphics/1_compiz_check_.* certification-status=blocker
75+ graphics/1_gl_support_.* certification-status=blocker
76 graphics/1_minimum_resolution_.*
77 suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
78 bootstrap_include:
79@@ -79,7 +79,7 @@ include:
80 graphics/2_auto_switch_card_.* certification-status=blocker
81 graphics/2_valid_opengl_renderer_.* certification-status=blocker
82 graphics/2_driver_version_.* certification-status=blocker
83- graphics/2_compiz_check_.* certification-status=blocker
84+ graphics/2_gl_support_.* certification-status=blocker
85 graphics/2_minimum_resolution_.*
86 suspend/2_resolution_before_suspend_.*_auto certification-status=blocker
87 bootstrap_include:
88@@ -107,7 +107,7 @@ include:
89 # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs)
90 suspend/1_suspend-time-check_.*_auto certification-status=non-blocker
91 suspend/1_suspend-single-log-attach_.*_auto certification-status=non-blocker
92- suspend/1_compiz_check_after_suspend_.*_auto certification-status=blocker
93+ suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
94 suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker
95 suspend/1_resolution_after_suspend_.*_auto certification-status=blocker
96
97@@ -146,7 +146,7 @@ include:
98 suspend/2_suspend_after_switch_to_card_.*_auto certification-status=blocker
99 suspend/2_suspend-time-check_.*_auto certification-status=non-blocker
100 suspend/2_suspend-single-log-attach_.*_auto certification-status=non-blocker
101- suspend/2_compiz_check_after_suspend_.*_auto certification-status=blocker
102+ suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
103 suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker
104 suspend/2_resolution_after_suspend_.*_auto certification-status=blocker
105
106@@ -174,7 +174,7 @@ include:
107 graphics/1_maximum_resolution_.* certification-status=blocker
108 graphics/1_glxgears_.* certification-status=blocker
109 graphics/1_driver_version_.* certification-status=blocker
110- graphics/1_compiz_check_.* certification-status=blocker
111+ graphics/1_gl_support_.* certification-status=blocker
112 graphics/1_rotation_.* certification-status=blocker
113 graphics/1_video_.* certification-status=blocker
114 suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
115@@ -191,7 +191,7 @@ include:
116 graphics/2_valid_opengl_renderer_.* certification-status=blocker
117 graphics/2_glxgears_.* certification-status=blocker
118 graphics/2_driver_version_.* certification-status=blocker
119- graphics/2_compiz_check_.* certification-status=blocker
120+ graphics/2_gl_support_.* certification-status=blocker
121 graphics/2_rotation_.* certification-status=blocker
122 graphics/2_video_.* certification-status=blocker
123 bootstrap_include:
124@@ -207,7 +207,7 @@ include:
125 power-management/lid certification-status=blocker
126 power-management/lid_close certification-status=blocker
127 power-management/lid_open certification-status=blocker
128- suspend/1_compiz_check_after_suspend_.*_auto certification-status=blocker
129+ suspend/1_gl_support_after_suspend_.*_auto certification-status=blocker
130 suspend/1_driver_version_after_suspend_.*_auto certification-status=blocker
131 suspend/1_resolution_after_suspend_.*_auto certification-status=blocker
132 suspend/1_display_after_suspend_.*_graphics certification-status=blocker
133@@ -221,7 +221,7 @@ _description: After suspend tests (discrete GPU, certification blockers only)
134 include:
135 suspend/2_resolution_before_suspend_.*_auto certification-status=blocker
136 suspend/2_suspend_after_switch_to_card_.*_graphics certification-status=blocker
137- suspend/2_compiz_check_after_suspend_.*_auto certification-status=blocker
138+ suspend/2_gl_support_after_suspend_.*_auto certification-status=blocker
139 suspend/2_driver_version_after_suspend_.*_auto certification-status=blocker
140 suspend/2_resolution_after_suspend_.*_auto certification-status=blocker
141 suspend/2_display_after_suspend_.*_graphics certification-status=blocker
142diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
143index d4fe923..21effcc 100644
144--- a/units/suspend/suspend-graphics.pxu
145+++ b/units/suspend/suspend-graphics.pxu
146@@ -115,7 +115,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off'
147 template-engine: jinja2
148 plugin: shell
149 category_id: com.canonical.plainbox::suspend
150-id: suspend/{{ index }}_compiz_check_after_suspend_{{ product_slug }}_auto
151+id: suspend/{{ index }}_gl_support_after_suspend_{{ product_slug }}_auto
152 depends:
153 {%- if gpu_count > "1" %}
154 suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
155@@ -125,10 +125,10 @@ depends:
156 requires: package.name == 'nux-tools'
157 command:
158 source graphics_env {{ driver }} {{ index }}
159- ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
160+ ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
161 estimated_duration: 0.130
162-_description: Check that {{ product }} hardware is able to run compiz after suspend
163-_summary: Test Compiz support for {{ product }} after suspend
164+_description: Check that {{ product }} hardware is able to run a desktop session (OpenGL)
165+_summary: Test OpenGL support for {{ product }} after suspend
166
167 unit: template
168 template-resource: graphics_card
169diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
170index 35ba417..5d9bf08 100644
171--- a/units/suspend/suspend.pxu
172+++ b/units/suspend/suspend.pxu
173@@ -2120,23 +2120,23 @@ template-resource: graphics_card
174 template-filter: graphics_card.prime_gpu_offload == 'Off'
175 plugin: shell
176 category_id: com.canonical.plainbox::suspend
177-id: suspend/{index}_compiz_check_after_suspend_{product_slug}
178+id: suspend/{index}_gl_support_after_suspend_{product_slug}
179 depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
180 requires: package.name == 'nux-tools'
181-command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
182+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
183 estimated_duration: 0.130
184-_description: Check that {product} hardware is able to run compiz after suspend
185-_summary: Test Compiz support for {product} after suspend
186+_description: Check that {product} hardware is able to run a desktop session (OpenGL) after suspend
187+_summary: Test OpenGL support for {product} after suspend
188
189 plugin: shell
190 category_id: com.canonical.plainbox::suspend
191-id: suspend/compiz_check_after_suspend
192+id: suspend/gl_support_after_suspend
193 depends: suspend/suspend_advanced
194 requires: package.name == 'nux-tools'
195-command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
196+command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error"
197 estimated_duration: 0.130
198-_description: Check that the hardware is able to run compiz after suspend
199-_summary: Test Compiz support after suspend
200+_description: Check that the hardware is able to run a desktop session (OpenGL)
201+_summary: Test OpenGL support after suspend
202
203 unit: template
204 template-resource: graphics_card

Subscribers

People subscribed via source and target branches