Merge ~pieq/plainbox-provider-checkbox:remove-suspend_advanced-dependency into plainbox-provider-checkbox:master
- Git
- lp:~pieq/plainbox-provider-checkbox
- remove-suspend_advanced-dependency
- Merge into master
Proposed by
Pierre Equoy
Status: | Merged |
---|---|
Approved by: | Pierre Equoy |
Approved revision: | f812a816df3f26953304b02f0e24b28615426933 |
Merged at revision: | c44c4af4e3213cbe70a169d480ae7a0fd833cb24 |
Proposed branch: | ~pieq/plainbox-provider-checkbox:remove-suspend_advanced-dependency |
Merge into: | plainbox-provider-checkbox:master |
Diff against target: |
2624 lines (+394/-426) 33 files modified
units/audio/jobs.pxu (+6/-6) units/bluetooth/jobs.pxu (+2/-2) units/bluetooth/test-plan.pxu (+1/-1) units/camera/jobs.pxu (+3/-3) units/camera/test-plan.pxu (+4/-4) units/dock/jobs.pxu (+32/-32) units/dock/test-plan.pxu (+20/-20) units/graphics/test-plan.pxu (+2/-2) units/keys/jobs.pxu (+15/-15) units/keys/test-plan.pxu (+23/-23) units/led/jobs.pxu (+2/-4) units/led/test-plan.pxu (+7/-7) units/monitor/jobs.pxu (+14/-14) units/monitor/test-plan.pxu (+78/-78) units/optical/jobs.pxu (+2/-2) units/optical/test-plan.pxu (+4/-4) units/power-management/jobs.pxu (+1/-1) units/stress/jobs.pxu (+2/-2) units/suspend/suspend-graphics.pxu (+6/-6) units/suspend/suspend.pxu (+58/-58) units/suspend/test-plan.pxu (+1/-1) units/thunderbolt/jobs.pxu (+14/-14) units/thunderbolt/test-plan.pxu (+6/-6) units/touchpad/jobs.pxu (+13/-13) units/touchscreen/jobs.pxu (+5/-5) units/touchscreen/test-plan.pxu (+9/-9) units/usb/test-plan.pxu (+17/-17) units/usb/usb-c.pxu (+9/-9) units/wireless/jobs.pxu (+10/-22) units/wireless/test-plan.pxu (+11/-29) units/wireless/wireless-connection-netplan.pxu (+8/-8) units/wwan/jobs.pxu (+5/-5) units/wwan/test-plan.pxu (+4/-4) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Maciej Kisielewski | Approve | ||
Review via email: mp+411995@code.launchpad.net |
Commit message
Description of the change
This proposal supersedes Kristin's proposal from a few months ago[1].
I simply:
1. rebased it on the latest changes from plainbox-
2. re-ran the tests described in the comments from the other MR[1] using a laptop with dual GPU
3. made sure there was no reference to `also-after-
It looks OK to me, and I'm sorry it took so long to be reviewed... so long that Kristin is actually gone! :'(
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/units/audio/jobs.pxu b/units/audio/jobs.pxu |
2 | index e6b21a6..44cfe54 100644 |
3 | --- a/units/audio/jobs.pxu |
4 | +++ b/units/audio/jobs.pxu |
5 | @@ -70,7 +70,7 @@ requires: |
6 | package.name == 'alsa-base' |
7 | package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' |
8 | package.name == 'pulseaudio-utils' |
9 | -flags: also-after-suspend-manual |
10 | +flags: also-after-suspend |
11 | command: |
12 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
13 | audio_settings.py set --verbose --device=hdmi --volume=50 |
14 | @@ -99,7 +99,7 @@ requires: |
15 | package.name == 'alsa-base' |
16 | package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' |
17 | package.name == 'pulseaudio-utils' |
18 | -flags: also-after-suspend-manual |
19 | +flags: also-after-suspend |
20 | command: |
21 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
22 | audio_settings.py set --verbose --device=hdmi --volume=50 |
23 | @@ -129,7 +129,7 @@ requires: |
24 | package.name == 'alsa-base' |
25 | package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' |
26 | package.name == 'pulseaudio-utils' |
27 | -flags: also-after-suspend-manual |
28 | +flags: also-after-suspend |
29 | command: |
30 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
31 | audio_settings.py set --verbose --device=hdmi --volume=50 |
32 | @@ -159,7 +159,7 @@ requires: |
33 | package.name == 'alsa-base' |
34 | package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' |
35 | package.name == 'pulseaudio-utils' |
36 | -flags: also-after-suspend-manual |
37 | +flags: also-after-suspend |
38 | command: |
39 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
40 | audio_settings.py set --verbose --device=hdmi --volume=50 |
41 | @@ -190,7 +190,7 @@ requires: |
42 | package.name == 'alsa-base' |
43 | package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' |
44 | package.name == 'pulseaudio-utils' |
45 | -flags: also-after-suspend-manual |
46 | +flags: also-after-suspend |
47 | command: |
48 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
49 | audio_settings.py set --verbose --device=hdmi --volume=50 |
50 | @@ -221,7 +221,7 @@ requires: |
51 | package.name == 'alsa-base' |
52 | package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' |
53 | package.name == 'pulseaudio-utils' |
54 | -flags: also-after-suspend-manual |
55 | +flags: also-after-suspend |
56 | command: |
57 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
58 | audio_settings.py set --verbose --device=hdmi --volume=50 |
59 | diff --git a/units/bluetooth/jobs.pxu b/units/bluetooth/jobs.pxu |
60 | index 7f3fb79..fbfef23 100644 |
61 | --- a/units/bluetooth/jobs.pxu |
62 | +++ b/units/bluetooth/jobs.pxu |
63 | @@ -258,7 +258,7 @@ command: |
64 | checkbox-support-eddystone_scanner -D {interface} |
65 | plugin: shell |
66 | user: root |
67 | -flags: also-after-suspend also-after-suspend-manual |
68 | +flags: also-after-suspend |
69 | category_id: com.canonical.plainbox::bluetooth |
70 | estimated_duration: 10 |
71 | |
72 | @@ -389,6 +389,6 @@ _steps: |
73 | _verification: |
74 | Confirm characters from Bluetooth input device are displayed correctly |
75 | plugin: manual |
76 | -flags: also-after-suspend-manual |
77 | +flags: also-after-suspend |
78 | category_id: com.canonical.plainbox::bluetooth |
79 | estimated_duration: 5m |
80 | diff --git a/units/bluetooth/test-plan.pxu b/units/bluetooth/test-plan.pxu |
81 | index 9de4d37..9f1ec27 100644 |
82 | --- a/units/bluetooth/test-plan.pxu |
83 | +++ b/units/bluetooth/test-plan.pxu |
84 | @@ -109,7 +109,7 @@ _name: Manual Bluetooth tests |
85 | _description: Manual QA tests for Bluetooth |
86 | estimated_duration: 5m |
87 | include: |
88 | - after-suspend-manual-bluetooth/keyboard-manual |
89 | + after-suspend-bluetooth/keyboard-manual |
90 | |
91 | id: after-suspend-bluez-automated |
92 | unit: test plan |
93 | diff --git a/units/camera/jobs.pxu b/units/camera/jobs.pxu |
94 | index 285fc2e..35bd879 100644 |
95 | --- a/units/camera/jobs.pxu |
96 | +++ b/units/camera/jobs.pxu |
97 | @@ -28,7 +28,7 @@ template-unit: job |
98 | plugin: user-interact-verify |
99 | category_id: com.canonical.plainbox::camera |
100 | id: camera/display_{name} |
101 | -flags: also-after-suspend-manual |
102 | +flags: also-after-suspend |
103 | _summary: Webcam video display test for {product_slug} |
104 | estimated_duration: 120.0 |
105 | depends: camera/detect |
106 | @@ -62,7 +62,7 @@ _description: |
107 | 2. Camera LED should light for a few seconds |
108 | VERIFICATION: |
109 | Did the camera LED light? |
110 | -flags: also-after-suspend-manual |
111 | +flags: also-after-suspend |
112 | |
113 | unit: template |
114 | template-resource: device |
115 | @@ -72,7 +72,7 @@ plugin: user-interact-verify |
116 | template-engine: jinja2 |
117 | category_id: com.canonical.plainbox::camera |
118 | id: camera/still_{{ name }} |
119 | -flags: also-after-suspend-manual |
120 | +flags: also-after-suspend |
121 | _summary: Webcam still image capture test for {{ product_slug }} |
122 | estimated_duration: 120.0 |
123 | depends: camera/detect |
124 | diff --git a/units/camera/test-plan.pxu b/units/camera/test-plan.pxu |
125 | index d60b6dd..ee23896 100644 |
126 | --- a/units/camera/test-plan.pxu |
127 | +++ b/units/camera/test-plan.pxu |
128 | @@ -24,8 +24,8 @@ unit: test plan |
129 | _name: Camera tests (after suspend) |
130 | _description: Camera tests (after suspend) |
131 | include: |
132 | - after-suspend-manual-camera/still_.* certification-status=blocker |
133 | - after-suspend-manual-camera/display_.* certification-status=blocker |
134 | + after-suspend-camera/still_.* certification-status=blocker |
135 | + after-suspend-camera/display_.* certification-status=blocker |
136 | bootstrap_include: |
137 | device |
138 | |
139 | @@ -56,8 +56,8 @@ unit: test plan |
140 | _name: Camera tests (after suspend, certification blockers only) |
141 | _description: Camera tests (after suspend, certification blockers only) |
142 | include: |
143 | - after-suspend-manual-camera/still_.* certification-status=blocker |
144 | - after-suspend-manual-camera/display_.* certification-status=blocker |
145 | + after-suspend-camera/still_.* certification-status=blocker |
146 | + after-suspend-camera/display_.* certification-status=blocker |
147 | bootstrap_include: |
148 | device |
149 | |
150 | diff --git a/units/dock/jobs.pxu b/units/dock/jobs.pxu |
151 | index fb98be0..ca291d7 100644 |
152 | --- a/units/dock/jobs.pxu |
153 | +++ b/units/dock/jobs.pxu |
154 | @@ -242,7 +242,7 @@ requires: |
155 | package.name == 'pulseaudio-utils' |
156 | _summary: HDMI audio test |
157 | plugin: user-interact-verify |
158 | -flags: also-after-suspend-manual |
159 | +flags: also-after-suspend |
160 | estimated_duration: 30.0 |
161 | command: |
162 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
163 | @@ -270,7 +270,7 @@ requires: |
164 | package.name == 'pulseaudio-utils' |
165 | _summary: DisplayPort audio test |
166 | plugin: user-interact-verify |
167 | -flags: also-after-suspend-manual |
168 | +flags: also-after-suspend |
169 | estimated_duration: 30.0 |
170 | command: |
171 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
172 | @@ -325,7 +325,7 @@ requires: |
173 | package.name == 'pulseaudio-utils' |
174 | _summary: HDMI audio test |
175 | plugin: user-interact-verify |
176 | -flags: also-after-suspend-manual |
177 | +flags: also-after-suspend |
178 | estimated_duration: 30.0 |
179 | command: |
180 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
181 | @@ -355,7 +355,7 @@ requires: |
182 | manifest.has_thunderbolt3 == 'True' |
183 | _summary: DisplayPort audio test |
184 | plugin: user-interact-verify |
185 | -flags: also-after-suspend-manual |
186 | +flags: also-after-suspend |
187 | estimated_duration: 30.0 |
188 | command: |
189 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
190 | @@ -377,7 +377,7 @@ _verification: |
191 | id: dock/audio-playback-headphones |
192 | category_id: dock-audio |
193 | plugin: user-interact-verify |
194 | -flags: also-after-suspend-manual |
195 | +flags: also-after-suspend |
196 | estimated_duration: 30.0 |
197 | _summary: Headphones output test |
198 | depends: dock/audio-list-devices |
199 | @@ -407,7 +407,7 @@ plugin: user-interact-verify |
200 | category_id: dock-audio |
201 | id: dock/audio-alsa-record-playback-external |
202 | estimated_duration: 30.0 |
203 | -flags: also-after-suspend-manual |
204 | +flags: also-after-suspend |
205 | _summary: External microphone plugged to the dock to record sound test |
206 | depends: dock/audio-playback-headphones |
207 | requires: |
208 | @@ -843,7 +843,7 @@ _description: |
209 | plugin: user-interact |
210 | category_id: dock-usb |
211 | id: dock/usb-c/c-to-a-adapter/insert-after-suspend |
212 | -depends: suspend/suspend_advanced |
213 | +depends: suspend/suspend_advanced_auto |
214 | imports: from com.canonical.plainbox import manifest |
215 | requires: |
216 | usb.usb3 == 'supported' |
217 | @@ -868,7 +868,7 @@ _verification: |
218 | plugin: user-interact |
219 | category_id: dock-usb |
220 | id: dock/usb-c/insert-after-suspend |
221 | -depends: suspend/suspend_advanced |
222 | +depends: suspend/suspend_advanced_auto |
223 | imports: from com.canonical.plainbox import manifest |
224 | requires: |
225 | usb.usb3 == 'supported' |
226 | @@ -1114,7 +1114,7 @@ requires: |
227 | package.name == 'pulseaudio-utils' |
228 | _summary: HDMI audio test |
229 | plugin: user-interact-verify |
230 | -flags: also-after-suspend-manual |
231 | +flags: also-after-suspend |
232 | estimated_duration: 30.0 |
233 | command: |
234 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
235 | @@ -1142,7 +1142,7 @@ requires: |
236 | package.name == 'pulseaudio-utils' |
237 | _summary: HDMI audio test |
238 | plugin: user-interact-verify |
239 | -flags: also-after-suspend-manual |
240 | +flags: also-after-suspend |
241 | estimated_duration: 30.0 |
242 | command: |
243 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
244 | @@ -1170,7 +1170,7 @@ requires: |
245 | package.name == 'pulseaudio-utils' |
246 | _summary: DisplayPort audio test |
247 | plugin: user-interact-verify |
248 | -flags: also-after-suspend-manual |
249 | +flags: also-after-suspend |
250 | estimated_duration: 30.0 |
251 | command: |
252 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
253 | @@ -1198,7 +1198,7 @@ requires: |
254 | package.name == 'pulseaudio-utils' |
255 | _summary: HDMI audio test |
256 | plugin: user-interact-verify |
257 | -flags: also-after-suspend-manual |
258 | +flags: also-after-suspend |
259 | estimated_duration: 30.0 |
260 | command: |
261 | audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
262 | @@ -1243,7 +1243,7 @@ command: audio_settings.py store --file="$PLAINBOX_SESSION_SHARE"/audio_settings |
263 | id: dock/networking-gateway-ping-after-suspend |
264 | category_id: dock-network |
265 | plugin: shell |
266 | -depends: suspend/suspend_advanced ethernet/detect |
267 | +depends: suspend/suspend_advanced_auto ethernet/detect |
268 | command: gateway_ping_test.py |
269 | estimated_duration: 2.00 |
270 | _summary: Network gateway ping after suspend |
271 | @@ -1252,7 +1252,7 @@ _description: Tests whether the system has a working Internet connection. |
272 | plugin: user-interact |
273 | id: dock/usb-insert-after-suspend |
274 | category_id: dock-usb |
275 | -depends: suspend/suspend_advanced |
276 | +depends: suspend/suspend_advanced_auto |
277 | estimated_duration: 10.0 |
278 | _summary: USB drive insertion after resuming |
279 | command: removable_storage_watcher.py insert usb |
280 | @@ -1274,7 +1274,7 @@ _verification: |
281 | |
282 | id: dock/power-button-after-suspend |
283 | category_id: dock |
284 | -depends: suspend/suspend_advanced |
285 | +depends: suspend/suspend_advanced_auto |
286 | plugin: manual |
287 | estimated_duration: 30.00 |
288 | _summary: Docking test |
289 | @@ -1289,7 +1289,7 @@ _verification: |
290 | plugin: user-interact |
291 | id: dock/usb3-insert-after-suspend |
292 | category_id: dock-usb |
293 | -depends: suspend/suspend_advanced |
294 | +depends: suspend/suspend_advanced_auto |
295 | estimated_duration: 10.0 |
296 | _summary: USB3 drive insertion after resuming |
297 | command: removable_storage_watcher.py -m 500000000 insert usb |
298 | @@ -1367,7 +1367,7 @@ _description: |
299 | plugin: user-interact-verify |
300 | id: dock/usb-HID-after-suspend |
301 | category_id: dock-usb |
302 | -depends: suspend/suspend_advanced |
303 | +depends: suspend/suspend_advanced_auto |
304 | estimated_duration: 20.0 |
305 | _summary: USB HID device test after resuming |
306 | command: keyboard_test.py |
307 | @@ -1382,7 +1382,7 @@ _verification: |
308 | |
309 | id: dock/monitor-displayport-after-suspend |
310 | category_id: dock-display |
311 | -depends: suspend/suspend_advanced |
312 | +depends: suspend/suspend_advanced_auto |
313 | estimated_duration: 120.0 |
314 | _summary: DisplayPort test on the dock after resuming |
315 | plugin: manual |
316 | @@ -1397,7 +1397,7 @@ _verification: |
317 | |
318 | id: dock/monitor-dvi-after-suspend |
319 | category_id: dock-display |
320 | -depends: suspend/suspend_advanced |
321 | +depends: suspend/suspend_advanced_auto |
322 | estimated_duration: 120.0 |
323 | _summary: DVI port test on the dock after resuming |
324 | plugin: manual |
325 | @@ -1412,7 +1412,7 @@ _verification: |
326 | |
327 | id: dock/monitor-hdmi-after-suspend |
328 | category_id: dock-display |
329 | -depends: suspend/suspend_advanced |
330 | +depends: suspend/suspend_advanced_auto |
331 | estimated_duration: 120.0 |
332 | _summary: HDMI port test on the dock after resuming |
333 | plugin: manual |
334 | @@ -1427,7 +1427,7 @@ _verification: |
335 | |
336 | id: dock/monitor-vga-after-suspend |
337 | category_id: dock-display |
338 | -depends: suspend/suspend_advanced |
339 | +depends: suspend/suspend_advanced_auto |
340 | estimated_duration: 120.0 |
341 | _summary: VGA port test on the dock after resuming |
342 | plugin: manual |
343 | @@ -1442,7 +1442,7 @@ _verification: |
344 | |
345 | id: dock/monitor_type-c_displayport-after-suspend |
346 | category_id: dock-display |
347 | -depends: suspend/suspend_advanced |
348 | +depends: suspend/suspend_advanced_auto |
349 | estimated_duration: 120 |
350 | plugin: manual |
351 | _summary: Display connected via DisplayPort using an USB Type-C port after resuming |
352 | @@ -1460,7 +1460,7 @@ _verification: |
353 | |
354 | id: dock/monitor_type-c_hdmi-after-suspend |
355 | category_id: dock-display |
356 | -depends: suspend/suspend_advanced |
357 | +depends: suspend/suspend_advanced_auto |
358 | estimated_duration: 120 |
359 | plugin: manual |
360 | _summary: Display connected via HDMI using an USB Type-C port after resuming |
361 | @@ -1478,7 +1478,7 @@ _verification: |
362 | |
363 | id: dock/monitor_type-c_vga-after-suspend |
364 | category_id: dock-display |
365 | -depends: suspend/suspend_advanced |
366 | +depends: suspend/suspend_advanced_auto |
367 | estimated_duration: 120 |
368 | plugin: manual |
369 | _summary: Display connected via VGA using an USB Type-C port after resuming |
370 | @@ -1496,7 +1496,7 @@ _verification: |
371 | |
372 | id: dock/monitor-dual-head-after-suspend |
373 | category_id: dock-display |
374 | -depends: suspend/suspend_advanced |
375 | +depends: suspend/suspend_advanced_auto |
376 | estimated_duration: 120.0 |
377 | _summary: Dual monitors test while docked after suspend |
378 | plugin: manual |
379 | @@ -1513,7 +1513,7 @@ _verification: |
380 | |
381 | id: dock/monitor-triple-head-after-suspend |
382 | category_id: dock-display |
383 | -depends: suspend/suspend_advanced |
384 | +depends: suspend/suspend_advanced_auto |
385 | estimated_duration: 120.0 |
386 | _summary: Tripple monitors test while docked after suspend |
387 | plugin: manual |
388 | @@ -1959,7 +1959,7 @@ estimated_duration: 40.0 |
389 | depends: dock/cold-plug |
390 | imports: from com.canonical.plainbox import manifest |
391 | requires: manifest.has_thunderbolt3 == 'True' |
392 | -flags: also-after-suspend-manual |
393 | +flags: also-after-suspend |
394 | command: removable_storage_watcher.py insert --timeout 40 scsi |
395 | _summary: Thunderbolt3 storage insertion detection |
396 | _purpose: |
397 | @@ -1981,7 +1981,7 @@ user: root |
398 | depends: dock/thunderbolt3-insert |
399 | imports: from com.canonical.plainbox import manifest |
400 | requires: manifest.has_thunderbolt3 == 'True' |
401 | -flags: also-after-suspend-manual |
402 | +flags: also-after-suspend |
403 | command: removable_storage_test.py -s 268400000 scsi |
404 | _summary: Thunderbolt3 storage test |
405 | _description: |
406 | @@ -1995,7 +1995,7 @@ estimated_duration: 20.0 |
407 | depends: dock/thunderbolt3-insert |
408 | imports: from com.canonical.plainbox import manifest |
409 | requires: manifest.has_thunderbolt3 == 'True' |
410 | -flags: also-after-suspend-manual |
411 | +flags: also-after-suspend |
412 | command: removable_storage_watcher.py remove scsi |
413 | _summary: Thunderbolt3 storage removal detection |
414 | _purpose: |
415 | @@ -2011,7 +2011,7 @@ _verification: |
416 | plugin: user-interact-verify |
417 | category_id: dock |
418 | id: dock/thunderbolt3-daisy-chain |
419 | -flags: also-after-suspend-manual |
420 | +flags: also-after-suspend |
421 | estimated_duration: 45.0 |
422 | imports: from com.canonical.plainbox import manifest |
423 | requires: manifest.has_thunderbolt3 == 'True' |
424 | @@ -2036,7 +2036,7 @@ _purpose: |
425 | id: dock/hot-plug-after-suspend |
426 | category_id: dock-hotplug |
427 | plugin: manual |
428 | -depends: suspend/suspend_advanced |
429 | +depends: suspend/suspend_advanced_auto |
430 | estimated_duration: 30.00 |
431 | _summary: Docking test |
432 | _purpose: |
433 | @@ -2050,7 +2050,7 @@ _verification: |
434 | plugin: user-interact-verify |
435 | category_id: dock-hotplug |
436 | id: dock/hotplug-ethernet-after-suspend |
437 | -depends: suspend/suspend_advanced |
438 | +depends: suspend/suspend_advanced_auto |
439 | command: network_check.py |
440 | estimated_duration: 10 |
441 | _description: |
442 | diff --git a/units/dock/test-plan.pxu b/units/dock/test-plan.pxu |
443 | index f5bc162..b9d3429 100644 |
444 | --- a/units/dock/test-plan.pxu |
445 | +++ b/units/dock/test-plan.pxu |
446 | @@ -103,7 +103,7 @@ include: |
447 | # Do power on/off to clean up the test environment |
448 | power-management/poweroff certification-status=blocker |
449 | power-management/poweroff-log-attach |
450 | - suspend/suspend_advanced certification-status=blocker |
451 | + suspend/suspend_advanced_auto certification-status=blocker |
452 | dock/power-button-after-suspend certification-status=blocker |
453 | dock/networking-gateway-ping-after-suspend certification-status=blocker |
454 | dock/usb-HID-after-suspend certification-status=blocker |
455 | @@ -119,23 +119,23 @@ include: |
456 | dock/usb-c/insert-after-suspend |
457 | dock/usb-c/storage-automated-after-suspend |
458 | dock/usb-c/remove-after-suspend |
459 | - after-suspend-manual-dock/audio-playback-headphones certification-status=blocker |
460 | - after-suspend-manual-dock/audio-alsa-record-playback-external certification-status=blocker |
461 | + after-suspend-dock/audio-playback-headphones certification-status=blocker |
462 | + after-suspend-dock/audio-alsa-record-playback-external certification-status=blocker |
463 | dock/monitor-displayport-after-suspend certification-status=blocker |
464 | - after-suspend-manual-dock/audio-playback-displayport certification-status=blocker |
465 | + after-suspend-dock/audio-playback-displayport certification-status=blocker |
466 | dock/monitor-dvi-after-suspend certification-status=blocker |
467 | dock/monitor-hdmi-after-suspend certification-status=blocker |
468 | - after-suspend-manual-dock/audio-playback-hdmi certification-status=blocker |
469 | + after-suspend-dock/audio-playback-hdmi certification-status=blocker |
470 | dock/monitor-vga-after-suspend certification-status=blocker |
471 | dock/monitor_type-c_displayport-after-suspend |
472 | - after-suspend-manual-dock/audio-playback-type-c-displayport |
473 | + after-suspend-dock/audio-playback-type-c-displayport |
474 | dock/monitor_type-c_hdmi-after-suspend |
475 | dock/monitor_type-c_vga-after-suspend |
476 | - after-suspend-manual-dock/thunderbolt3-insert |
477 | - after-suspend-manual-dock/thunderbolt3-storage-test |
478 | - after-suspend-manual-dock/thunderbolt3-remove |
479 | - after-suspend-manual-dock/thunderbolt3-daisy-chain |
480 | - after-suspend-manual-dock/audio-playback-thunderbolt3 |
481 | + after-suspend-dock/thunderbolt3-insert |
482 | + after-suspend-dock/thunderbolt3-storage-test |
483 | + after-suspend-dock/thunderbolt3-remove |
484 | + after-suspend-dock/thunderbolt3-daisy-chain |
485 | + after-suspend-dock/audio-playback-thunderbolt3 |
486 | dock/monitor-dual-head-after-suspend certification-status=blocker |
487 | dock/monitor-triple-head-after-suspend |
488 | |
489 | @@ -155,10 +155,10 @@ include: |
490 | dock/hotplug-usb3-remove-after-suspend |
491 | dock/hotplug-monitor-displayport-after-suspend |
492 | dock/hotplug-monitor-hdmi-after-suspend |
493 | - after-suspend-manual-dock/hotplug-playback-displayport |
494 | - after-suspend-manual-dock/hotplug-playback-hdmi |
495 | - after-suspend-manual-dock/hotplug-playback-type-c-displayport |
496 | - after-suspend-manual-dock/hotplug-playback-thumderbolt3 |
497 | + after-suspend-dock/hotplug-playback-displayport |
498 | + after-suspend-dock/hotplug-playback-hdmi |
499 | + after-suspend-dock/hotplug-playback-type-c-displayport |
500 | + after-suspend-dock/hotplug-playback-thumderbolt3 |
501 | |
502 | id: suspend-dock-resume-test |
503 | unit: test plan |
504 | @@ -235,11 +235,11 @@ include: |
505 | # Do power on/off to clean up the test environment |
506 | power-management/poweroff certification-status=blocker |
507 | power-management/poweroff-log-attach |
508 | - suspend/suspend_advanced certification-status=blocker |
509 | + suspend/suspend_advanced_auto certification-status=blocker |
510 | dock/power-button-after-suspend certification-status=blocker |
511 | dock/networking-gateway-ping-after-suspend certification-status=blocker |
512 | - after-suspend-manual-dock/audio-playback-headphones certification-status=blocker |
513 | - after-suspend-manual-dock/audio-alsa-record-playback-external certification-status=blocker |
514 | + after-suspend-dock/audio-playback-headphones certification-status=blocker |
515 | + after-suspend-dock/audio-alsa-record-playback-external certification-status=blocker |
516 | dock/usb-HID-after-suspend certification-status=blocker |
517 | dock/usb-insert-after-suspend certification-status=blocker |
518 | dock/usb-storage-automated-after-suspend certification-status=blocker |
519 | @@ -248,9 +248,9 @@ include: |
520 | dock/usb3-storage-automated-after-suspend certification-status=blocker |
521 | dock/usb3-remove-after-suspend certification-status=blocker |
522 | dock/monitor-displayport-after-suspend certification-status=blocker |
523 | - after-suspend-manual-dock/audio-playback-displayport certification-status=blocker |
524 | + after-suspend-dock/audio-playback-displayport certification-status=blocker |
525 | dock/monitor-dvi-after-suspend certification-status=blocker |
526 | dock/monitor-hdmi-after-suspend certification-status=blocker |
527 | - after-suspend-manual-dock/audio-playback-hdmi certification-status=blocker |
528 | + after-suspend-dock/audio-playback-hdmi certification-status=blocker |
529 | dock/monitor-vga-after-suspend certification-status=blocker |
530 | dock/monitor-dual-head-after-suspend certification-status=blocker |
531 | diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu |
532 | index 16ca11c..8725b0d 100644 |
533 | --- a/units/graphics/test-plan.pxu |
534 | +++ b/units/graphics/test-plan.pxu |
535 | @@ -103,7 +103,7 @@ include: |
536 | suspend/1_suspend_after_switch_to_card_.*_auto certification-status=blocker |
537 | # The following after suspend jobs will automatically select the right suspend job |
538 | # depending on the amount of graphic cards available on the SUT: |
539 | - # suspend/suspend_advanced (one GPU) |
540 | + # suspend/suspend_advanced_auto (one GPU) |
541 | # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs) |
542 | suspend/1_suspend-time-check_.*_auto certification-status=non-blocker |
543 | suspend/1_suspend-single-log-attach_.*_auto certification-status=non-blocker |
544 | @@ -118,7 +118,7 @@ _description: After suspend tests (integrated GPU manual) |
545 | include: |
546 | # The following after suspend jobs will automatically select the right suspend job |
547 | # depending on the amount of graphic cards available on the SUT: |
548 | - # suspend/suspend_advanced (one GPU) |
549 | + # suspend/suspend_advanced_auto (one GPU) |
550 | # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs) |
551 | power-management/lid certification-status=blocker |
552 | power-management/lid_close certification-status=blocker |
553 | diff --git a/units/keys/jobs.pxu b/units/keys/jobs.pxu |
554 | index 6c4fc99..767d88d 100644 |
555 | --- a/units/keys/jobs.pxu |
556 | +++ b/units/keys/jobs.pxu |
557 | @@ -4,7 +4,7 @@ id: keys/lock-screen |
558 | estimated_duration: 30.0 |
559 | imports: from com.canonical.plainbox import manifest |
560 | requires: manifest.has_special_keys == 'True' |
561 | -flags: also-after-suspend-manual |
562 | +flags: also-after-suspend |
563 | command: lock_screen_watcher.py |
564 | _description: |
565 | PURPOSE: |
566 | @@ -24,7 +24,7 @@ id: keys/brightness |
567 | estimated_duration: 30.0 |
568 | imports: from com.canonical.plainbox import manifest |
569 | requires: manifest.has_special_keys == 'True' |
570 | -flags: also-after-suspend-manual |
571 | +flags: also-after-suspend |
572 | _description: |
573 | PURPOSE: |
574 | This test will test the brightness key |
575 | @@ -39,7 +39,7 @@ id: keys/volume |
576 | estimated_duration: 30.0 |
577 | imports: from com.canonical.plainbox import manifest |
578 | requires: manifest.has_special_keys == 'True' |
579 | -flags: also-after-suspend-manual |
580 | +flags: also-after-suspend |
581 | user: root |
582 | command: key_test.py -s '0xe02e,0xe0ae:Volume Down' '0xe030,0xe0b0:Volume Up' |
583 | _description: |
584 | @@ -58,7 +58,7 @@ id: keys/mute |
585 | estimated_duration: 30.0 |
586 | imports: from com.canonical.plainbox import manifest |
587 | requires: manifest.has_special_keys == 'True' |
588 | -flags: also-after-suspend-manual |
589 | +flags: also-after-suspend |
590 | user: root |
591 | command: key_test.py -s '0xe020,0xe0a0:Mute' |
592 | _description: |
593 | @@ -76,7 +76,7 @@ id: keys/sleep |
594 | estimated_duration: 90.0 |
595 | imports: from com.canonical.plainbox import manifest |
596 | requires: manifest.has_special_keys == 'True' |
597 | -flags: also-after-suspend-manual |
598 | +flags: also-after-suspend |
599 | _description: |
600 | PURPOSE: |
601 | This test will test the sleep key |
602 | @@ -92,7 +92,7 @@ id: keys/battery-info |
603 | estimated_duration: 30.0 |
604 | imports: from com.canonical.plainbox import manifest |
605 | requires: manifest.has_special_keys == 'True' |
606 | -flags: also-after-suspend-manual |
607 | +flags: also-after-suspend |
608 | user: root |
609 | command: key_test.py -s '0xe071,0xef1:Battery Info' |
610 | _description: |
611 | @@ -112,7 +112,7 @@ id: keys/wireless |
612 | estimated_duration: 90.0 |
613 | imports: from com.canonical.plainbox import manifest |
614 | requires: manifest.has_special_keys == 'True' |
615 | -flags: also-after-suspend-manual |
616 | +flags: also-after-suspend |
617 | _description: |
618 | PURPOSE: |
619 | This test will test the wireless key |
620 | @@ -134,7 +134,7 @@ id: keys/media-control |
621 | estimated_duration: 30.0 |
622 | imports: from com.canonical.plainbox import manifest |
623 | requires: manifest.has_special_keys == 'True' |
624 | -flags: also-after-suspend-manual |
625 | +flags: also-after-suspend |
626 | user: root |
627 | command: key_test.py -s 0xe010,0xe090:Previous 0xe024,0xe0a4:Stop 0xe019,0xe099:Next 0xe022,0xe0a2:Play |
628 | _description: |
629 | @@ -153,7 +153,7 @@ id: keys/super |
630 | estimated_duration: 30.0 |
631 | imports: from com.canonical.plainbox import manifest |
632 | requires: manifest.has_special_keys == 'True' |
633 | -flags: also-after-suspend-manual |
634 | +flags: also-after-suspend |
635 | user: root |
636 | command: key_test.py -s '0xe05b,0xe0db:Left Super Key' |
637 | _description: |
638 | @@ -171,7 +171,7 @@ id: keys/video-out |
639 | estimated_duration: 120.0 |
640 | imports: from com.canonical.plainbox import manifest |
641 | requires: manifest.has_special_keys == 'True' |
642 | -flags: also-after-suspend-manual |
643 | +flags: also-after-suspend |
644 | _description: |
645 | PURPOSE: |
646 | Validate that the External Video hot key is working as expected |
647 | @@ -187,7 +187,7 @@ id: keys/touchpad |
648 | estimated_duration: 30.0 |
649 | imports: from com.canonical.plainbox import manifest |
650 | requires: manifest.has_special_keys == 'True' |
651 | -flags: also-after-suspend-manual |
652 | +flags: also-after-suspend |
653 | _description: |
654 | PURPOSE: |
655 | Verify touchpad hotkey toggles touchpad functionality on and off |
656 | @@ -204,7 +204,7 @@ id: keys/keyboard-backlight |
657 | estimated_duration: 30.0 |
658 | imports: from com.canonical.plainbox import manifest |
659 | requires: manifest.has_special_keys == 'True' |
660 | -flags: also-after-suspend-manual |
661 | +flags: also-after-suspend |
662 | _description: |
663 | PURPOSE: |
664 | Verify that the keyboard backlight toggle key works properly |
665 | @@ -227,7 +227,7 @@ requires: |
666 | package.name == 'alsa-base' |
667 | package.name == 'pulseaudio-utils' |
668 | package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good' |
669 | -flags: also-after-suspend-manual |
670 | +flags: also-after-suspend |
671 | command: |
672 | audio_settings.py store --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings |
673 | audio_settings.py set --device=pci --volume=50 |
674 | @@ -281,7 +281,7 @@ plugin: manual |
675 | category_id: com.canonical.plainbox::keys |
676 | id: keys/power-button |
677 | estimated_duration: 30.0 |
678 | -flags: also-after-suspend-manual |
679 | +flags: also-after-suspend |
680 | _purpose: |
681 | This test will test the power button |
682 | _steps: |
683 | @@ -320,7 +320,7 @@ id: keys/fn-lock |
684 | estimated_duration: 30.0 |
685 | imports: from com.canonical.plainbox import manifest |
686 | requires: manifest.has_special_keys == 'True' |
687 | -flags: also-after-suspend-manual |
688 | +flags: also-after-suspend |
689 | _purpose: |
690 | This test will test the Fn Lock key |
691 | _steps: |
692 | diff --git a/units/keys/test-plan.pxu b/units/keys/test-plan.pxu |
693 | index ffc111c..dc82838 100644 |
694 | --- a/units/keys/test-plan.pxu |
695 | +++ b/units/keys/test-plan.pxu |
696 | @@ -42,18 +42,18 @@ _name: Special keys tests (after suspend) |
697 | _description: |
698 | Special keys tests (after suspend) |
699 | include: |
700 | - after-suspend-manual-keys/lock-screen certification-status=blocker |
701 | - after-suspend-manual-keys/super certification-status=blocker |
702 | - after-suspend-manual-keys/brightness certification-status=blocker |
703 | - after-suspend-manual-keys/media-control certification-status=blocker |
704 | - after-suspend-manual-keys/mute certification-status=blocker |
705 | - after-suspend-manual-keys/volume certification-status=blocker |
706 | - after-suspend-manual-keys/video-out certification-status=blocker |
707 | - after-suspend-manual-keys/wireless certification-status=blocker |
708 | - after-suspend-manual-keys/keyboard-backlight certification-status=blocker |
709 | - after-suspend-manual-keys/microphone-mute certification-status=blocker |
710 | - after-suspend-manual-keys/power-button certification-status=blocker |
711 | - after-suspend-manual-keys/fn-lock certification-status=non-blocker |
712 | + after-suspend-keys/lock-screen certification-status=blocker |
713 | + after-suspend-keys/super certification-status=blocker |
714 | + after-suspend-keys/brightness certification-status=blocker |
715 | + after-suspend-keys/media-control certification-status=blocker |
716 | + after-suspend-keys/mute certification-status=blocker |
717 | + after-suspend-keys/volume certification-status=blocker |
718 | + after-suspend-keys/video-out certification-status=blocker |
719 | + after-suspend-keys/wireless certification-status=blocker |
720 | + after-suspend-keys/keyboard-backlight certification-status=blocker |
721 | + after-suspend-keys/microphone-mute certification-status=blocker |
722 | + after-suspend-keys/power-button certification-status=blocker |
723 | + after-suspend-keys/fn-lock certification-status=non-blocker |
724 | |
725 | id: keys-cert-blockers |
726 | unit: test plan |
727 | @@ -81,14 +81,14 @@ _name: Special keys tests (certification blockers only, after suspend) |
728 | _description: |
729 | Special keys tests (certification blockers only, after suspend) |
730 | include: |
731 | - after-suspend-manual-keys/lock-screen certification-status=blocker |
732 | - after-suspend-manual-keys/super certification-status=blocker |
733 | - after-suspend-manual-keys/brightness certification-status=blocker |
734 | - after-suspend-manual-keys/media-control certification-status=blocker |
735 | - after-suspend-manual-keys/mute certification-status=blocker |
736 | - after-suspend-manual-keys/volume certification-status=blocker |
737 | - after-suspend-manual-keys/video-out certification-status=blocker |
738 | - after-suspend-manual-keys/wireless certification-status=blocker |
739 | - after-suspend-manual-keys/keyboard-backlight certification-status=blocker |
740 | - after-suspend-manual-keys/microphone-mute certification-status=blocker |
741 | - after-suspend-manual-keys/power-button certification-status=blocker |
742 | + after-suspend-keys/lock-screen certification-status=blocker |
743 | + after-suspend-keys/super certification-status=blocker |
744 | + after-suspend-keys/brightness certification-status=blocker |
745 | + after-suspend-keys/media-control certification-status=blocker |
746 | + after-suspend-keys/mute certification-status=blocker |
747 | + after-suspend-keys/volume certification-status=blocker |
748 | + after-suspend-keys/video-out certification-status=blocker |
749 | + after-suspend-keys/wireless certification-status=blocker |
750 | + after-suspend-keys/keyboard-backlight certification-status=blocker |
751 | + after-suspend-keys/microphone-mute certification-status=blocker |
752 | + after-suspend-keys/power-button certification-status=blocker |
753 | diff --git a/units/led/jobs.pxu b/units/led/jobs.pxu |
754 | index 1ff3c38..89f8415 100644 |
755 | --- a/units/led/jobs.pxu |
756 | +++ b/units/led/jobs.pxu |
757 | @@ -27,7 +27,7 @@ plugin: manual |
758 | category_id: led |
759 | id: led/suspend |
760 | estimated_duration: 30.0 |
761 | -depends: suspend/suspend_advanced |
762 | +depends: suspend/suspend_advanced_auto |
763 | _description: |
764 | PURPOSE: |
765 | Suspend LED verification. |
766 | @@ -218,7 +218,6 @@ _description: |
767 | VERIFICATION: |
768 | Did the Audio LED turn on and off or change color as expected? |
769 | flags: also-after-suspend |
770 | - also-after-suspend-manual |
771 | |
772 | plugin: manual |
773 | category_id: led |
774 | @@ -235,7 +234,6 @@ _description: |
775 | VERIFICATION: |
776 | Did the Microphone Mute LED turn on and off or change color as expected? |
777 | flags: also-after-suspend |
778 | - also-after-suspend-manual |
779 | |
780 | id: led/serial |
781 | _summary: Serial ports LED behavior |
782 | @@ -255,7 +253,7 @@ plugin: manual |
783 | category_id: led |
784 | id: led/fn |
785 | estimated_duration: 30.0 |
786 | -flags: also-after-suspend-manual |
787 | +flags: also-after-suspend |
788 | _purpose: |
789 | This test will test Fn key LED |
790 | _steps: |
791 | diff --git a/units/led/test-plan.pxu b/units/led/test-plan.pxu |
792 | index b0d0129..c3e9ed9 100644 |
793 | --- a/units/led/test-plan.pxu |
794 | +++ b/units/led/test-plan.pxu |
795 | @@ -52,16 +52,16 @@ unit: test plan |
796 | _name: LED tests (after suspend) |
797 | _description: LED tests (after suspend) |
798 | include: |
799 | - after-suspend-manual-camera/led_.* certification-status=blocker |
800 | + after-suspend-camera/led_.* certification-status=blocker |
801 | suspend/led_after_suspend/caps-lock certification-status=blocker |
802 | suspend/led_after_suspend/numeric-keypad certification-status=blocker |
803 | suspend/led_after_suspend/power certification-status=blocker |
804 | - after-suspend-manual-led/mute certification-status=blocker |
805 | - after-suspend-manual-led/microphone-mute certification-status=blocker |
806 | + after-suspend-led/mute certification-status=blocker |
807 | + after-suspend-led/microphone-mute certification-status=blocker |
808 | suspend/led_after_suspend/bluetooth certification-status=non-blocker |
809 | suspend/led_after_suspend/wlan certification-status=non-blocker |
810 | suspend/led_after_suspend/wlan-disabled certification-status=non-blocker |
811 | - after-suspend-manual-led/fn certification-status=non-blocker |
812 | + after-suspend-led/fn certification-status=non-blocker |
813 | bootstrap_include: |
814 | device |
815 | |
816 | @@ -86,12 +86,12 @@ unit: test plan |
817 | _name: LED tests (after suspend, certification blockers only) |
818 | _description: LED tests (after suspend, certification blockers only) |
819 | include: |
820 | - after-suspend-manual-camera/led_.* certification-status=blocker |
821 | + after-suspend-camera/led_.* certification-status=blocker |
822 | suspend/led_after_suspend/caps-lock certification-status=blocker |
823 | suspend/led_after_suspend/numeric-keypad certification-status=blocker |
824 | suspend/led_after_suspend/power certification-status=blocker |
825 | - after-suspend-manual-led/mute certification-status=blocker |
826 | - after-suspend-manual-led/microphone-mute certification-status=blocker |
827 | + after-suspend-led/mute certification-status=blocker |
828 | + after-suspend-led/microphone-mute certification-status=blocker |
829 | bootstrap_include: |
830 | device |
831 | |
832 | diff --git a/units/monitor/jobs.pxu b/units/monitor/jobs.pxu |
833 | index 2ba9e99..46ecb20 100644 |
834 | --- a/units/monitor/jobs.pxu |
835 | +++ b/units/monitor/jobs.pxu |
836 | @@ -3,7 +3,7 @@ template-resource: graphics_card |
837 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
838 | id: monitor/{index}_vga_{product_slug} |
839 | requires: display.vga == 'supported' or display.dp == 'supported' |
840 | -flags: also-after-suspend-manual |
841 | +flags: also-after-suspend |
842 | plugin: manual |
843 | category_id: com.canonical.plainbox::monitor |
844 | _purpose: |
845 | @@ -22,7 +22,7 @@ template-resource: graphics_card |
846 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
847 | id: monitor/{index}_dvi_{product_slug} |
848 | requires: display.dvi == 'supported' |
849 | -flags: also-after-suspend-manual |
850 | +flags: also-after-suspend |
851 | plugin: manual |
852 | category_id: com.canonical.plainbox::monitor |
853 | _purpose: |
854 | @@ -41,7 +41,7 @@ template-resource: graphics_card |
855 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
856 | id: monitor/{index}_displayport_{product_slug} |
857 | requires: display.dp == 'supported' |
858 | -flags: also-after-suspend-manual |
859 | +flags: also-after-suspend |
860 | plugin: manual |
861 | category_id: com.canonical.plainbox::monitor |
862 | _purpose: |
863 | @@ -60,7 +60,7 @@ template-resource: graphics_card |
864 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
865 | id: monitor/{index}_hdmi_{product_slug} |
866 | requires: display.hdmi == 'supported' |
867 | -flags: also-after-suspend-manual |
868 | +flags: also-after-suspend |
869 | plugin: manual |
870 | category_id: com.canonical.plainbox::monitor |
871 | _purpose: |
872 | @@ -115,7 +115,7 @@ template-resource: graphics_card |
873 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
874 | id: monitor/{index}_multi-head_{product_slug} |
875 | requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower', 'Space-saving'] |
876 | -flags: also-after-suspend-manual |
877 | +flags: also-after-suspend |
878 | plugin: manual |
879 | category_id: com.canonical.plainbox::monitor |
880 | _purpose: |
881 | @@ -132,7 +132,7 @@ _verification: |
882 | unit: template |
883 | template-resource: graphics_card |
884 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
885 | -flags: also-after-suspend-manual |
886 | +flags: also-after-suspend |
887 | id: monitor/{index}_powersaving_{product_slug} |
888 | plugin: user-interact-verify |
889 | category_id: com.canonical.plainbox::monitor |
890 | @@ -153,7 +153,7 @@ requires: dmi.product in ['Notebook','Laptop','Portable','All In One','All-In-On |
891 | plugin: user-interact-verify |
892 | category_id: com.canonical.plainbox::monitor |
893 | user: root |
894 | -flags: also-after-suspend-manual |
895 | +flags: also-after-suspend |
896 | command: brightness_test.py |
897 | _purpose: |
898 | This test will test changes to screen brightness |
899 | @@ -171,7 +171,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off' |
900 | id: monitor/{index}_thunderbolt_{product_slug} |
901 | imports: from com.canonical.plainbox import manifest |
902 | requires: manifest.has_thunderbolt == 'True' |
903 | -flags: also-after-suspend-manual |
904 | +flags: also-after-suspend |
905 | estimated_duration: 15.0 |
906 | plugin: manual |
907 | category_id: com.canonical.plainbox::monitor |
908 | @@ -193,7 +193,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off' |
909 | id: monitor/{index}_thunderbolt3_{product_slug} |
910 | imports: from com.canonical.plainbox import manifest |
911 | requires: manifest.has_thunderbolt3 == 'True' |
912 | -flags: also-after-suspend-manual |
913 | +flags: also-after-suspend |
914 | estimated_duration: 15.0 |
915 | plugin: manual |
916 | category_id: com.canonical.plainbox::monitor |
917 | @@ -215,7 +215,7 @@ id: monitor/{index}_type-c_displayport_{product_slug} |
918 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
919 | imports: from com.canonical.plainbox import manifest |
920 | requires: manifest.has_usb_type_c == 'True' |
921 | -flags: also-after-suspend-manual |
922 | +flags: also-after-suspend |
923 | estimated_duration: 15.0 |
924 | plugin: manual |
925 | category_id: com.canonical.plainbox::monitor |
926 | @@ -237,7 +237,7 @@ id: monitor/{index}_type-c_hdmi_{product_slug} |
927 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
928 | imports: from com.canonical.plainbox import manifest |
929 | requires: manifest.has_usb_type_c == 'True' |
930 | -flags: also-after-suspend-manual |
931 | +flags: also-after-suspend |
932 | estimated_duration: 15.0 |
933 | plugin: manual |
934 | category_id: com.canonical.plainbox::monitor |
935 | @@ -259,7 +259,7 @@ id: monitor/{index}_type-c_vga_{product_slug} |
936 | template-filter: graphics_card.prime_gpu_offload == 'Off' |
937 | imports: from com.canonical.plainbox import manifest |
938 | requires: manifest.has_usb_type_c == 'True' |
939 | -flags: also-after-suspend-manual |
940 | +flags: also-after-suspend |
941 | estimated_duration: 15.0 |
942 | plugin: manual |
943 | category_id: com.canonical.plainbox::monitor |
944 | @@ -278,7 +278,7 @@ _verification: |
945 | id: monitor/type-c-to-hdmi |
946 | imports: from com.canonical.plainbox import manifest |
947 | requires: manifest.has_usb_type_c == 'True' |
948 | -flags: also-after-suspend-manual |
949 | +flags: also-after-suspend |
950 | estimated_duration: 15.0 |
951 | plugin: manual |
952 | category_id: com.canonical.plainbox::monitor |
953 | @@ -297,7 +297,7 @@ _verification: |
954 | id: monitor/type-c-to-vga |
955 | imports: from com.canonical.plainbox import manifest |
956 | requires: manifest.has_usb_type_c == 'True' |
957 | -flags: also-after-suspend-manual |
958 | +flags: also-after-suspend |
959 | estimated_duration: 15.0 |
960 | plugin: manual |
961 | category_id: com.canonical.plainbox::monitor |
962 | diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu |
963 | index 21b16cb..7c7b73a 100644 |
964 | --- a/units/monitor/test-plan.pxu |
965 | +++ b/units/monitor/test-plan.pxu |
966 | @@ -16,7 +16,7 @@ _name: Monitor tests (after suspend, integrated GPU) |
967 | _description: Monitor tests (after suspend, integrated GPU) |
968 | include: |
969 | nested_part: |
970 | - after-suspend-manual-monitor-integrated-gpu-cert-manual |
971 | + after-suspend-monitor-integrated-gpu-cert-manual |
972 | |
973 | id: monitor-integrated-gpu-cert-manual |
974 | unit: test plan |
975 | @@ -45,30 +45,30 @@ include: |
976 | bootstrap_include: |
977 | graphics_card |
978 | |
979 | -id: after-suspend-manual-monitor-integrated-gpu-cert-manual |
980 | +id: after-suspend-monitor-integrated-gpu-cert-manual |
981 | unit: test plan |
982 | -_name: Monitor tests (after manual suspend, integrated GPU) (Manual) |
983 | +_name: Monitor tests (after suspend, integrated GPU) (Manual) |
984 | _description: |
985 | - Monitor tests (after manual suspend, integrated GPU) (Manual) |
986 | + Monitor tests (after suspend, integrated GPU) (Manual) |
987 | include: |
988 | - after-suspend-manual-monitor/1_powersaving_.* certification-status=blocker |
989 | - after-suspend-manual-power-management/light_sensor |
990 | - after-suspend-manual-monitor/1_dim_brightness_.* certification-status=blocker |
991 | - after-suspend-manual-monitor/1_displayport_.* certification-status=blocker |
992 | - after-suspend-manual-audio/1_playback_displayport_.* certification-status=blocker |
993 | - after-suspend-manual-monitor/1_type-c_displayport_.* certification-status=blocker |
994 | - after-suspend-manual-audio/1_playback_type-c_displayport_.* certification-status=blocker |
995 | - after-suspend-manual-monitor/1_type-c_hdmi_.* certification-status=blocker |
996 | - after-suspend-manual-audio/1_playback_type-c_hdmi_.* certification-status=blocker |
997 | - after-suspend-manual-monitor/1_type-c_vga_.* certification-status=blocker |
998 | - after-suspend-manual-monitor/1_dvi_.* certification-status=blocker |
999 | - after-suspend-manual-monitor/1_hdmi_.* certification-status=blocker |
1000 | - after-suspend-manual-audio/1_playback_hdmi_.* certification-status=blocker |
1001 | - after-suspend-manual-monitor/1_thunderbolt3_.* certification-status=non-blocker |
1002 | - after-suspend-manual-audio/1_playback_thunderbolt3_.* certification-status=non-blocker |
1003 | - after-suspend-manual-thunderbolt3/daisy-chain certification-status=non-blocker |
1004 | - after-suspend-manual-monitor/1_vga_.* certification-status=blocker |
1005 | - after-suspend-manual-monitor/1_multi-head_.* certification-status=blocker |
1006 | + after-suspend-monitor/1_powersaving_.* certification-status=blocker |
1007 | + after-suspend-power-management/light_sensor |
1008 | + after-suspend-monitor/1_dim_brightness_.* certification-status=blocker |
1009 | + after-suspend-monitor/1_displayport_.* certification-status=blocker |
1010 | + after-suspend-audio/1_playback_displayport_.* certification-status=blocker |
1011 | + after-suspend-monitor/1_type-c_displayport_.* certification-status=blocker |
1012 | + after-suspend-audio/1_playback_type-c_displayport_.* certification-status=blocker |
1013 | + after-suspend-monitor/1_type-c_hdmi_.* certification-status=blocker |
1014 | + after-suspend-audio/1_playback_type-c_hdmi_.* certification-status=blocker |
1015 | + after-suspend-monitor/1_type-c_vga_.* certification-status=blocker |
1016 | + after-suspend-monitor/1_dvi_.* certification-status=blocker |
1017 | + after-suspend-monitor/1_hdmi_.* certification-status=blocker |
1018 | + after-suspend-audio/1_playback_hdmi_.* certification-status=blocker |
1019 | + after-suspend-monitor/1_thunderbolt3_.* certification-status=non-blocker |
1020 | + after-suspend-audio/1_playback_thunderbolt3_.* certification-status=non-blocker |
1021 | + after-suspend-thunderbolt3/daisy-chain certification-status=non-blocker |
1022 | + after-suspend-monitor/1_vga_.* certification-status=blocker |
1023 | + after-suspend-monitor/1_multi-head_.* certification-status=blocker |
1024 | bootstrap_include: |
1025 | graphics_card |
1026 | |
1027 | @@ -127,33 +127,33 @@ _name: Monitor tests (after suspend, integrated GPU) |
1028 | _description: Monitor tests (after suspend, integrated GPU) |
1029 | include: |
1030 | nested_part: |
1031 | - after-suspend-manual-monitor-discrete-gpu-cert-manual |
1032 | + after-suspend-monitor-discrete-gpu-cert-manual |
1033 | |
1034 | |
1035 | -id: after-suspend-manual-monitor-discrete-gpu-cert-manual |
1036 | +id: after-suspend-monitor-discrete-gpu-cert-manual |
1037 | unit: test plan |
1038 | -_name: Monitor tests (after manual suspend, discrete GPU) (Manual) |
1039 | +_name: Monitor tests (after suspend, discrete GPU) (Manual) |
1040 | _description: |
1041 | - Monitor tests (after manual suspend, discrete GPU) (Manual) |
1042 | + Monitor tests (after suspend, discrete GPU) (Manual) |
1043 | include: |
1044 | - after-suspend-manual-monitor/2_powersaving_.* certification-status=blocker |
1045 | - after-suspend-manual-power-management/light_sensor |
1046 | - after-suspend-manual-monitor/2_dim_brightness_.* certification-status=blocker |
1047 | - after-suspend-manual-monitor/2_displayport_.* certification-status=blocker |
1048 | - after-suspend-manual-audio/2_playback_displayport_.* certification-status=blocker |
1049 | - after-suspend-manual-monitor/2_type-c_displayport_.* certification-status=blocker |
1050 | - after-suspend-manual-audio/2_playback_type-c_displayport_.* certification-status=blocker |
1051 | - after-suspend-manual-monitor/2_type-c_hdmi_.* certification-status=blocker |
1052 | - after-suspend-manual-audio/2_playback_type-c_hdmi_.* certification-status=blocker |
1053 | - after-suspend-manual-monitor/2_type-c_vga_.* certification-status=blocker |
1054 | - after-suspend-manual-monitor/2_dvi_.* certification-status=blocker |
1055 | - after-suspend-manual-monitor/2_hdmi_.* certification-status=blocker |
1056 | - after-suspend-manual-audio/2_playback_hdmi_.* certification-status=blocker |
1057 | - after-suspend-manual-monitor/2_thunderbolt3_.* certification-status=non-blocker |
1058 | - after-suspend-manual-audio/2_playback_thunderbolt3_.* certification-status=non-blocker |
1059 | - after-suspend-manual-thunderbolt3/daisy-chain certification-status=non-blocker |
1060 | - after-suspend-manual-monitor/2_vga_.* certification-status=blocker |
1061 | - after-suspend-manual-monitor/2_multi-head_.* certification-status=blocker |
1062 | + after-suspend-monitor/2_powersaving_.* certification-status=blocker |
1063 | + after-suspend-power-management/light_sensor |
1064 | + after-suspend-monitor/2_dim_brightness_.* certification-status=blocker |
1065 | + after-suspend-monitor/2_displayport_.* certification-status=blocker |
1066 | + after-suspend-audio/2_playback_displayport_.* certification-status=blocker |
1067 | + after-suspend-monitor/2_type-c_displayport_.* certification-status=blocker |
1068 | + after-suspend-audio/2_playback_type-c_displayport_.* certification-status=blocker |
1069 | + after-suspend-monitor/2_type-c_hdmi_.* certification-status=blocker |
1070 | + after-suspend-audio/2_playback_type-c_hdmi_.* certification-status=blocker |
1071 | + after-suspend-monitor/2_type-c_vga_.* certification-status=blocker |
1072 | + after-suspend-monitor/2_dvi_.* certification-status=blocker |
1073 | + after-suspend-monitor/2_hdmi_.* certification-status=blocker |
1074 | + after-suspend-audio/2_playback_hdmi_.* certification-status=blocker |
1075 | + after-suspend-monitor/2_thunderbolt3_.* certification-status=non-blocker |
1076 | + after-suspend-audio/2_playback_thunderbolt3_.* certification-status=non-blocker |
1077 | + after-suspend-thunderbolt3/daisy-chain certification-status=non-blocker |
1078 | + after-suspend-monitor/2_vga_.* certification-status=blocker |
1079 | + after-suspend-monitor/2_multi-head_.* certification-status=blocker |
1080 | bootstrap_include: |
1081 | graphics_card |
1082 | |
1083 | @@ -189,25 +189,25 @@ include: |
1084 | bootstrap_include: |
1085 | graphics_card |
1086 | |
1087 | -id: after-suspend-manual-monitor-integrated-gpu-cert-blockers |
1088 | +id: after-suspend-monitor-integrated-gpu-cert-blockers |
1089 | unit: test plan |
1090 | -_name: Monitor tests (after manual suspend, integrated GPU, certification blockers only) |
1091 | -_description: Monitor tests (after manual suspend, integrated GPU, certification blockers only) |
1092 | +_name: Monitor tests (after suspend, integrated GPU, certification blockers only) |
1093 | +_description: Monitor tests (after suspend, integrated GPU, certification blockers only) |
1094 | include: |
1095 | - after-suspend-manual-monitor/1_powersaving_.* certification-status=blocker |
1096 | - after-suspend-manual-monitor/1_dim_brightness_.* certification-status=blocker |
1097 | - after-suspend-manual-monitor/1_displayport_.* certification-status=blocker |
1098 | - after-suspend-manual-audio/1_playback_displayport_.* certification-status=blocker |
1099 | - after-suspend-manual-monitor/1_type-c_displayport_.* certification-status=blocker |
1100 | - after-suspend-manual-audio/1_playback_type-c_displayport_.* certification-status=blocker |
1101 | - after-suspend-manual-monitor/1_type-c_hdmi_.* certification-status=blocker |
1102 | - after-suspend-manual-audio/1_playback_type-c_hdmi_.* certification-status=blocker |
1103 | - after-suspend-manual-monitor/1_type-c_vga_.* certification-status=blocker |
1104 | - after-suspend-manual-monitor/1_dvi_.* certification-status=blocker |
1105 | - after-suspend-manual-monitor/1_hdmi_.* certification-status=blocker |
1106 | - after-suspend-manual-audio/1_playback_hdmi_.* certification-status=blocker |
1107 | - after-suspend-manual-monitor/1_vga_.* certification-status=blocker |
1108 | - after-suspend-manual-monitor/1_multi-head_.* certification-status=blocker |
1109 | + after-suspend-monitor/1_powersaving_.* certification-status=blocker |
1110 | + after-suspend-monitor/1_dim_brightness_.* certification-status=blocker |
1111 | + after-suspend-monitor/1_displayport_.* certification-status=blocker |
1112 | + after-suspend-audio/1_playback_displayport_.* certification-status=blocker |
1113 | + after-suspend-monitor/1_type-c_displayport_.* certification-status=blocker |
1114 | + after-suspend-audio/1_playback_type-c_displayport_.* certification-status=blocker |
1115 | + after-suspend-monitor/1_type-c_hdmi_.* certification-status=blocker |
1116 | + after-suspend-audio/1_playback_type-c_hdmi_.* certification-status=blocker |
1117 | + after-suspend-monitor/1_type-c_vga_.* certification-status=blocker |
1118 | + after-suspend-monitor/1_dvi_.* certification-status=blocker |
1119 | + after-suspend-monitor/1_hdmi_.* certification-status=blocker |
1120 | + after-suspend-audio/1_playback_hdmi_.* certification-status=blocker |
1121 | + after-suspend-monitor/1_vga_.* certification-status=blocker |
1122 | + after-suspend-monitor/1_multi-head_.* certification-status=blocker |
1123 | bootstrap_include: |
1124 | graphics_card |
1125 | |
1126 | @@ -233,25 +233,25 @@ include: |
1127 | bootstrap_include: |
1128 | graphics_card |
1129 | |
1130 | -id: after-suspend-manual-monitor-discrete-gpu-cert-blockers |
1131 | +id: after-suspend-monitor-discrete-gpu-cert-blockers |
1132 | unit: test plan |
1133 | -_name: Monitor tests (after manual suspend, discrete GPU, certification blockers only) |
1134 | -_description: Monitor tests (after manual suspend, discrete GPU, certification blockers only) |
1135 | +_name: Monitor tests (after suspend, discrete GPU, certification blockers only) |
1136 | +_description: Monitor tests (after suspend, discrete GPU, certification blockers only) |
1137 | include: |
1138 | - after-suspend-manual-monitor/2_powersaving_.* certification-status=blocker |
1139 | - after-suspend-manual-monitor/2_dim_brightness_.* certification-status=blocker |
1140 | - after-suspend-manual-monitor/2_displayport_.* certification-status=blocker |
1141 | - after-suspend-manual-audio/2_playback_displayport_.* certification-status=blocker |
1142 | - after-suspend-manual-monitor/2_type-c_displayport_.* certification-status=blocker |
1143 | - after-suspend-manual-audio/2_playback_type-c_displayport_.* certification-status=blocker |
1144 | - after-suspend-manual-monitor/2_type-c_hdmi_.* certification-status=blocker |
1145 | - after-suspend-manual-audio/2_playback_type-c_hdmi_.* certification-status=blocker |
1146 | - after-suspend-manual-monitor/2_type-c_vga_.* certification-status=blocker |
1147 | - after-suspend-manual-monitor/2_dvi_.* certification-status=blocker |
1148 | - after-suspend-manual-monitor/2_hdmi_.* certification-status=blocker |
1149 | - after-suspend-manual-audio/2_playback_hdmi_.* certification-status=blocker |
1150 | - after-suspend-manual-monitor/2_vga_.* certification-status=blocker |
1151 | - after-suspend-manual-monitor/2_multi-head_.* certification-status=blocker |
1152 | + after-suspend-monitor/2_powersaving_.* certification-status=blocker |
1153 | + after-suspend-monitor/2_dim_brightness_.* certification-status=blocker |
1154 | + after-suspend-monitor/2_displayport_.* certification-status=blocker |
1155 | + after-suspend-audio/2_playback_displayport_.* certification-status=blocker |
1156 | + after-suspend-monitor/2_type-c_displayport_.* certification-status=blocker |
1157 | + after-suspend-audio/2_playback_type-c_displayport_.* certification-status=blocker |
1158 | + after-suspend-monitor/2_type-c_hdmi_.* certification-status=blocker |
1159 | + after-suspend-audio/2_playback_type-c_hdmi_.* certification-status=blocker |
1160 | + after-suspend-monitor/2_type-c_vga_.* certification-status=blocker |
1161 | + after-suspend-monitor/2_dvi_.* certification-status=blocker |
1162 | + after-suspend-monitor/2_hdmi_.* certification-status=blocker |
1163 | + after-suspend-audio/2_playback_hdmi_.* certification-status=blocker |
1164 | + after-suspend-monitor/2_vga_.* certification-status=blocker |
1165 | + after-suspend-monitor/2_multi-head_.* certification-status=blocker |
1166 | bootstrap_include: |
1167 | graphics_card |
1168 | |
1169 | diff --git a/units/optical/jobs.pxu b/units/optical/jobs.pxu |
1170 | index bcb93c3..e38a998 100644 |
1171 | --- a/units/optical/jobs.pxu |
1172 | +++ b/units/optical/jobs.pxu |
1173 | @@ -16,7 +16,7 @@ id: optical/read_{name} |
1174 | estimated_duration: 120.0 |
1175 | user: root |
1176 | command: optical_read_test.py /dev/{name} |
1177 | -flags: also-after-suspend-manual |
1178 | +flags: also-after-suspend |
1179 | _description: |
1180 | PURPOSE: |
1181 | This test will check your {product} device's ability to read CD media |
1182 | @@ -165,7 +165,7 @@ requires: |
1183 | optical_drive_{name}.bd_read == "supported" |
1184 | user: root |
1185 | command: optical_read_test.py /dev/{name} |
1186 | -flags: also-after-suspend-manual |
1187 | +flags: also-after-suspend |
1188 | _description: |
1189 | PURPOSE: |
1190 | This test will check your {product} device's ability to read Blu-Ray (BD) media |
1191 | diff --git a/units/optical/test-plan.pxu b/units/optical/test-plan.pxu |
1192 | index f927f00..a9e054a 100644 |
1193 | --- a/units/optical/test-plan.pxu |
1194 | +++ b/units/optical/test-plan.pxu |
1195 | @@ -38,8 +38,8 @@ _description: |
1196 | Optical drive tests (after suspend) |
1197 | include: |
1198 | optical/detect certification-status=blocker |
1199 | - after-suspend-manual-optical/read_.* certification-status=blocker |
1200 | - after-suspend-manual-optical/bluray-read_.* certification-status=blocker |
1201 | + after-suspend-optical/read_.* certification-status=blocker |
1202 | + after-suspend-optical/bluray-read_.* certification-status=blocker |
1203 | bootstrap_include: |
1204 | device |
1205 | |
1206 | @@ -60,8 +60,8 @@ _name: Optical drive tests (certification blockers only) |
1207 | _description: Optical drive tests (certification blockers only) |
1208 | include: |
1209 | optical/detect certification-status=blocker |
1210 | - after-suspend-manual-optical/read_.* certification-status=blocker |
1211 | - after-suspend-manual-optical/bluray-read_.* certification-status=blocker |
1212 | + after-suspend-optical/read_.* certification-status=blocker |
1213 | + after-suspend-optical/bluray-read_.* certification-status=blocker |
1214 | bootstrap_include: |
1215 | device |
1216 | |
1217 | diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu |
1218 | index d449564..8a1a385 100644 |
1219 | --- a/units/power-management/jobs.pxu |
1220 | +++ b/units/power-management/jobs.pxu |
1221 | @@ -458,7 +458,7 @@ estimated_duration: 10.0 |
1222 | requires: |
1223 | dmi.product in ['Notebook','Laptop','Portable'] |
1224 | executable.name == 'monitor-sensor' |
1225 | -flags: also-after-suspend-manual |
1226 | +flags: also-after-suspend |
1227 | command: light_sensor_test.sh |
1228 | _description: |
1229 | _purpose: |
1230 | diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu |
1231 | index 544e7af..fbe30ca 100644 |
1232 | --- a/units/stress/jobs.pxu |
1233 | +++ b/units/stress/jobs.pxu |
1234 | @@ -106,7 +106,7 @@ id: power-management/suspend_30_cycles |
1235 | estimated_duration: 2400.0 |
1236 | depends: |
1237 | power-management/rtc |
1238 | - suspend/suspend_advanced |
1239 | + suspend/suspend_advanced_auto |
1240 | environ: PLAINBOX_SESSION_SHARE |
1241 | user: root |
1242 | command: |
1243 | @@ -598,4 +598,4 @@ command: |
1244 | done |
1245 | environ: WPA_N_SSID WPA_N_PSK |
1246 | category_id: com.canonical.plainbox::stress |
1247 | -flags: preserve-locale also-after-suspend-manual |
1248 | +flags: preserve-locale also-after-suspend |
1249 | diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu |
1250 | index 9a52fbb..22c3d9a 100644 |
1251 | --- a/units/suspend/suspend-graphics.pxu |
1252 | +++ b/units/suspend/suspend-graphics.pxu |
1253 | @@ -64,7 +64,7 @@ depends: |
1254 | {%- if gpu_count > "1" %} |
1255 | suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto |
1256 | {%- else %} |
1257 | - suspend/suspend_advanced |
1258 | + suspend/suspend_advanced_auto |
1259 | {%- endif %} |
1260 | _summary: Test display function after suspend for {{ vendor }} {{ product }} |
1261 | _description: |
1262 | @@ -87,7 +87,7 @@ depends: |
1263 | {%- if gpu_count > "1" %} |
1264 | suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto |
1265 | {%- else %} |
1266 | - suspend/suspend_advanced |
1267 | + suspend/suspend_advanced_auto |
1268 | {%- endif %} |
1269 | estimated_duration: 120.0 |
1270 | command: |
1271 | @@ -144,7 +144,7 @@ depends: |
1272 | {%- if gpu_count > "1" %} |
1273 | suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto |
1274 | {%- else %} |
1275 | - suspend/suspend_advanced |
1276 | + suspend/suspend_advanced_auto |
1277 | {%- endif %} |
1278 | requires: executable.name == 'glxgears' |
1279 | command: |
1280 | @@ -171,7 +171,7 @@ depends: |
1281 | {%- if gpu_count > "1" %} |
1282 | suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto |
1283 | {%- else %} |
1284 | - suspend/suspend_advanced |
1285 | + suspend/suspend_advanced_auto |
1286 | {%- endif %} |
1287 | plugin: user-interact-verify |
1288 | category_id: com.canonical.plainbox::suspend |
1289 | @@ -255,7 +255,7 @@ category_id: com.canonical.plainbox::stress |
1290 | estimated_duration: 5400.0 |
1291 | depends: |
1292 | power-management/rtc |
1293 | - suspend/suspend_advanced |
1294 | + suspend/suspend_advanced_auto |
1295 | graphics/{index}_auto_switch_card_{product_slug} |
1296 | flags: noreturn autorestart |
1297 | user: root |
1298 | @@ -281,7 +281,7 @@ depends: |
1299 | {%- if gpu_count > "1" %} |
1300 | suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto |
1301 | {%- else %} |
1302 | - suspend/suspend_advanced |
1303 | + suspend/suspend_advanced_auto |
1304 | {%- endif %} |
1305 | command: |
1306 | # shellcheck disable=SC1091 |
1307 | diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu |
1308 | index 8c25a91..d16bee6 100644 |
1309 | --- a/units/suspend/suspend.pxu |
1310 | +++ b/units/suspend/suspend.pxu |
1311 | @@ -234,7 +234,7 @@ id: suspend/{index}_suspend_after_switch_to_card_{product_slug} |
1312 | requires: |
1313 | sleep.mem == 'supported' |
1314 | rtc.state == 'supported' |
1315 | -depends: suspend/suspend_advanced graphics/{index}_switch_card_{product_slug} |
1316 | +depends: suspend/suspend_advanced_auto graphics/{index}_switch_card_{product_slug} |
1317 | user: root |
1318 | environ: PLAINBOX_SESSION_SHARE |
1319 | command: |
1320 | @@ -385,7 +385,7 @@ plugin: user-interact-verify |
1321 | category_id: com.canonical.plainbox::suspend |
1322 | id: power-management/usb_wakeup_keyboard |
1323 | user: root |
1324 | -depends: suspend/suspend_advanced |
1325 | +depends: suspend/suspend_advanced_auto |
1326 | estimated_duration: 120.0 |
1327 | command: pm-suspend |
1328 | _description: |
1329 | @@ -402,7 +402,7 @@ plugin: user-interact-verify |
1330 | category_id: com.canonical.plainbox::suspend |
1331 | id: power-management/usb_wakeup_mouse |
1332 | user: root |
1333 | -depends: suspend/suspend_advanced |
1334 | +depends: suspend/suspend_advanced_auto |
1335 | estimated_duration: 120.0 |
1336 | command: pm-suspend |
1337 | _description: |
1338 | @@ -419,7 +419,7 @@ plugin: shell |
1339 | category_id: com.canonical.plainbox::suspend |
1340 | id: suspend/network_after_suspend |
1341 | estimated_duration: 20.0 |
1342 | -depends: suspend/suspend_advanced suspend/network_before_suspend |
1343 | +depends: suspend/suspend_advanced_auto suspend/network_before_suspend |
1344 | _description: Test the network after resuming. |
1345 | command: network_wait.sh; gateway_ping_test.py | diff "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt - |
1346 | |
1347 | @@ -434,7 +434,7 @@ command: network_wait.sh; gateway_ping_test.py | diff "$PLAINBOX_SESSION_SHARE"/ |
1348 | plugin: shell |
1349 | category_id: com.canonical.plainbox::suspend |
1350 | id: suspend/resolution_after_suspend |
1351 | -depends: suspend/suspend_advanced suspend/resolution_before_suspend |
1352 | +depends: suspend/suspend_advanced_auto suspend/resolution_before_suspend |
1353 | estimated_duration: 1.2 |
1354 | _description: Test to see that we have the same resolution after resuming as before. |
1355 | command: xrandr -q | grep "[*]" | awk '{print $1}' | diff "$PLAINBOX_SESSION_SHARE"/resolution_before_suspend.txt - |
1356 | @@ -457,7 +457,7 @@ estimated_duration: 1.0 |
1357 | requires: |
1358 | device.category == 'AUDIO' |
1359 | package.name == 'alsa-base' |
1360 | -depends: suspend/suspend_advanced suspend/audio_before_suspend |
1361 | +depends: suspend/suspend_advanced_auto suspend/audio_before_suspend |
1362 | _description: Verify that mixer settings after suspend are the same as before suspend. |
1363 | command: |
1364 | audio_settings.py store --file="$PLAINBOX_SESSION_SHARE"/audio_settings_after_suspend |
1365 | @@ -479,7 +479,7 @@ command: |
1366 | plugin: user-interact |
1367 | category_id: com.canonical.plainbox::suspend |
1368 | id: suspend/speaker-headphone-plug-detection-after-suspend |
1369 | -depends: suspend/suspend_advanced |
1370 | +depends: suspend/suspend_advanced_auto |
1371 | estimated_duration: 60.0 |
1372 | requires: |
1373 | device.category == 'AUDIO' |
1374 | @@ -501,7 +501,7 @@ _description: |
1375 | plugin: user-interact |
1376 | category_id: com.canonical.plainbox::suspend |
1377 | id: suspend/microphone-plug-detection-after-suspend |
1378 | -depends: suspend/suspend_advanced |
1379 | +depends: suspend/suspend_advanced_auto |
1380 | estimated_duration: 60.0 |
1381 | requires: |
1382 | device.category == 'AUDIO' |
1383 | @@ -525,7 +525,7 @@ plugin: user-interact-verify |
1384 | category_id: com.canonical.plainbox::suspend |
1385 | id: suspend/playback_headphones-after-suspend |
1386 | estimated_duration: 20.0 |
1387 | -depends: audio/list_devices suspend/suspend_advanced |
1388 | +depends: audio/list_devices suspend/suspend_advanced_auto |
1389 | requires: |
1390 | device.category == 'AUDIO' |
1391 | package.name == 'alsa-base' |
1392 | @@ -551,7 +551,7 @@ plugin: user-interact-verify |
1393 | category_id: com.canonical.plainbox::suspend |
1394 | id: suspend/alsa_record_playback_external-after-suspend |
1395 | estimated_duration: 20.0 |
1396 | -depends: suspend/playback_headphones-after-suspend suspend/suspend_advanced |
1397 | +depends: suspend/playback_headphones-after-suspend suspend/suspend_advanced_auto |
1398 | requires: |
1399 | device.category == 'AUDIO' |
1400 | package.name == 'alsa-base' |
1401 | @@ -578,7 +578,7 @@ plugin: shell |
1402 | category_id: com.canonical.plainbox::suspend |
1403 | id: suspend/cpu_after_suspend |
1404 | estimated_duration: 1.2 |
1405 | -depends: suspend/suspend_advanced suspend/cpu_before_suspend |
1406 | +depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend |
1407 | _description: Verify that all CPUs are online after resuming. |
1408 | command: cpuinfo_resource.py | diff "$PLAINBOX_SESSION_SHARE"/cpuinfo_before_suspend - |
1409 | |
1410 | @@ -594,7 +594,7 @@ plugin: shell |
1411 | category_id: com.canonical.plainbox::suspend |
1412 | id: suspend/memory_after_suspend |
1413 | estimated_duration: 1.2 |
1414 | -depends: suspend/suspend_advanced suspend/memory_before_suspend |
1415 | +depends: suspend/suspend_advanced_auto suspend/memory_before_suspend |
1416 | _description: |
1417 | Verify that all memory is available after resuming from suspend. |
1418 | command: meminfo_resource.py | diff "$PLAINBOX_SESSION_SHARE"/meminfo_before_suspend - |
1419 | @@ -612,7 +612,7 @@ plugin: manual |
1420 | category_id: com.canonical.plainbox::suspend |
1421 | id: suspend/display_after_suspend |
1422 | estimated_duration: 120.0 |
1423 | -depends: suspend/suspend_advanced |
1424 | +depends: suspend/suspend_advanced_auto |
1425 | _description: |
1426 | PURPOSE: |
1427 | This test will check that the display is correct after suspend and resume |
1428 | @@ -643,7 +643,7 @@ template-filter: device.category == 'NETWORK' |
1429 | plugin: shell |
1430 | category_id: com.canonical.plainbox::suspend |
1431 | id: suspend/iperf_after_suspend_ether_auto_device{__index__}_{interface} |
1432 | -depends: suspend/suspend_advanced |
1433 | +depends: suspend/suspend_advanced_auto |
1434 | estimated_duration: 30.0 |
1435 | requires: |
1436 | package.name == 'iperf' |
1437 | @@ -659,7 +659,7 @@ template-filter: device.category == 'WIRELESS' |
1438 | plugin: shell |
1439 | category_id: com.canonical.plainbox::suspend |
1440 | id: suspend/iperf_after_suspend_wifi_auto_device{__index__}_{interface} |
1441 | -depends: suspend/suspend_advanced |
1442 | +depends: suspend/suspend_advanced_auto |
1443 | estimated_duration: 30.0 |
1444 | requires: |
1445 | package.name == 'iperf' |
1446 | @@ -700,7 +700,7 @@ _description: |
1447 | plugin: user-interact-verify |
1448 | category_id: com.canonical.plainbox::suspend |
1449 | id: suspend/wireless_connection_after_suspend_wpa_bg_manual |
1450 | -depends: suspend/suspend_advanced |
1451 | +depends: suspend/suspend_advanced_auto |
1452 | estimated_duration: 120.0 |
1453 | requires: |
1454 | device.category == 'WIRELESS' |
1455 | @@ -741,7 +741,7 @@ _description: |
1456 | plugin: user-interact-verify |
1457 | category_id: com.canonical.plainbox::suspend |
1458 | id: suspend/wireless_connection_after_suspend_open_bg_manual |
1459 | -depends: suspend/suspend_advanced |
1460 | +depends: suspend/suspend_advanced_auto |
1461 | estimated_duration: 120.0 |
1462 | requires: |
1463 | device.category == 'WIRELESS' |
1464 | @@ -782,7 +782,7 @@ _description: |
1465 | plugin: user-interact-verify |
1466 | category_id: com.canonical.plainbox::suspend |
1467 | id: suspend/wireless_connection_after_suspend_wpa_n_manual |
1468 | -depends: suspend/suspend_advanced |
1469 | +depends: suspend/suspend_advanced_auto |
1470 | estimated_duration: 120.0 |
1471 | requires: |
1472 | device.category == 'WIRELESS' |
1473 | @@ -823,7 +823,7 @@ _description: |
1474 | plugin: user-interact-verify |
1475 | category_id: com.canonical.plainbox::suspend |
1476 | id: suspend/wireless_connection_after_suspend_open_n_manual |
1477 | -depends: suspend/suspend_advanced |
1478 | +depends: suspend/suspend_advanced_auto |
1479 | estimated_duration: 120.0 |
1480 | requires: |
1481 | device.category == 'WIRELESS' |
1482 | @@ -864,7 +864,7 @@ _description: |
1483 | plugin: user-interact-verify |
1484 | category_id: com.canonical.plainbox::suspend |
1485 | id: suspend/wireless_connection_after_suspend_wpa_ac_manual |
1486 | -depends: suspend/suspend_advanced |
1487 | +depends: suspend/suspend_advanced_auto |
1488 | estimated_duration: 120.0 |
1489 | requires: |
1490 | device.category == 'WIRELESS' |
1491 | @@ -905,7 +905,7 @@ _description: |
1492 | plugin: user-interact-verify |
1493 | category_id: com.canonical.plainbox::suspend |
1494 | id: suspend/wireless_connection_after_suspend_open_ac_manual |
1495 | -depends: suspend/suspend_advanced |
1496 | +depends: suspend/suspend_advanced_auto |
1497 | estimated_duration: 120.0 |
1498 | requires: |
1499 | device.category == 'WIRELESS' |
1500 | @@ -946,7 +946,7 @@ _description: |
1501 | plugin: shell |
1502 | category_id: com.canonical.plainbox::suspend |
1503 | id: suspend/bluetooth_detect_after_suspend |
1504 | -depends: suspend/suspend_advanced bluetooth/detect-output |
1505 | +depends: suspend/suspend_advanced_auto bluetooth/detect-output |
1506 | estimated_duration: 1.2 |
1507 | requires: |
1508 | package.name == 'bluez' |
1509 | @@ -998,7 +998,7 @@ _description: |
1510 | plugin: shell |
1511 | category_id: com.canonical.plainbox::suspend |
1512 | id: suspend/bluetooth_obex_send_after_suspend |
1513 | -depends: suspend/suspend_advanced |
1514 | +depends: suspend/suspend_advanced_auto |
1515 | estimated_duration: 10.0 |
1516 | requires: |
1517 | package.name == 'bluez' |
1518 | @@ -1056,7 +1056,7 @@ _description: |
1519 | plugin: shell |
1520 | category_id: com.canonical.plainbox::suspend |
1521 | id: suspend/bluetooth_obex_browse_after_suspend |
1522 | -depends: suspend/suspend_advanced |
1523 | +depends: suspend/suspend_advanced_auto |
1524 | estimated_duration: 10.0 |
1525 | requires: |
1526 | package.name == 'bluez' |
1527 | @@ -1115,7 +1115,7 @@ plugin: shell |
1528 | category_id: com.canonical.plainbox::suspend |
1529 | id: suspend/bluetooth_obex_get_after_suspend |
1530 | estimated_duration: 20.0 |
1531 | -depends: suspend/suspend_advanced |
1532 | +depends: suspend/suspend_advanced_auto |
1533 | requires: |
1534 | package.name == 'bluez' |
1535 | executable.name == 'obexftp' |
1536 | @@ -1174,7 +1174,7 @@ category_id: com.canonical.plainbox::suspend |
1537 | id: suspend/cycle_resolutions_after_suspend |
1538 | estimated_duration: 120.0 |
1539 | requires: package.name == 'xorg' |
1540 | -depends: suspend/suspend_advanced |
1541 | +depends: suspend/suspend_advanced_auto |
1542 | command: xrandr_cycle.py --keyword=after_suspend --screenshot-dir "$PLAINBOX_SESSION_SHARE" |
1543 | _description: |
1544 | PURPOSE: |
1545 | @@ -1234,7 +1234,7 @@ plugin: shell |
1546 | category_id: com.canonical.plainbox::suspend |
1547 | id: suspend/record_playback_after_suspend |
1548 | estimated_duration: 10.0 |
1549 | -depends: suspend/suspend_advanced |
1550 | +depends: suspend/suspend_advanced_auto |
1551 | requires: |
1552 | package.name == 'python3-gi' |
1553 | package.name == 'gir1.2-gstreamer-1.0' |
1554 | @@ -1317,7 +1317,7 @@ _description: |
1555 | plugin: shell |
1556 | category_id: com.canonical.plainbox::suspend |
1557 | id: suspend/wifi_resume_time |
1558 | -depends: suspend/suspend_advanced |
1559 | +depends: suspend/suspend_advanced_auto |
1560 | requires: |
1561 | device.category == 'WIRELESS' |
1562 | command: network_reconnect_resume_test.py -t 90 -d wifi |
1563 | @@ -1341,7 +1341,7 @@ _description: |
1564 | plugin: shell |
1565 | category_id: com.canonical.plainbox::suspend |
1566 | id: suspend/network_resume_time |
1567 | -depends: suspend/suspend_advanced |
1568 | +depends: suspend/suspend_advanced_auto |
1569 | estimated_duration: 1.2 |
1570 | requires: |
1571 | device.category == 'NETWORK' |
1572 | @@ -1365,7 +1365,7 @@ _description: |
1573 | plugin: manual |
1574 | category_id: com.canonical.plainbox::suspend |
1575 | id: suspend/led_after_suspend/power |
1576 | -depends: suspend/suspend_advanced |
1577 | +depends: suspend/suspend_advanced_auto |
1578 | estimated_duration: 120.0 |
1579 | _description: |
1580 | PURPOSE: |
1581 | @@ -1379,7 +1379,7 @@ plugin: manual |
1582 | category_id: com.canonical.plainbox::suspend |
1583 | id: suspend/led_after_suspend/battery-charging |
1584 | estimated_duration: 120.0 |
1585 | -depends: suspend/suspend_advanced |
1586 | +depends: suspend/suspend_advanced_auto |
1587 | _description: |
1588 | PURPOSE: |
1589 | Validate that the battery light shows charging status after resuming from suspend |
1590 | @@ -1392,7 +1392,7 @@ _description: |
1591 | plugin: manual |
1592 | category_id: com.canonical.plainbox::suspend |
1593 | id: suspend/led_after_suspend/battery-charged |
1594 | -depends: suspend/suspend_advanced |
1595 | +depends: suspend/suspend_advanced_auto |
1596 | estimated_duration: 120.0 |
1597 | _description: |
1598 | PURPOSE: |
1599 | @@ -1407,7 +1407,7 @@ _description: |
1600 | plugin: manual |
1601 | category_id: com.canonical.plainbox::suspend |
1602 | id: suspend/led_after_suspend/battery-low |
1603 | -depends: suspend/suspend_advanced |
1604 | +depends: suspend/suspend_advanced_auto |
1605 | estimated_duration: 120.0 |
1606 | _description: |
1607 | PURPOSE: |
1608 | @@ -1421,7 +1421,7 @@ _description: |
1609 | plugin: user-interact-verify |
1610 | category_id: com.canonical.plainbox::suspend |
1611 | id: suspend/led_after_suspend/hdd |
1612 | -depends: suspend/suspend_advanced |
1613 | +depends: suspend/suspend_advanced_auto |
1614 | estimated_duration: 120.0 |
1615 | command: led_hdd_test.sh |
1616 | _description: |
1617 | @@ -1437,7 +1437,7 @@ plugin: user-interact-verify |
1618 | category_id: com.canonical.plainbox::suspend |
1619 | id: suspend/led_after_suspend/numeric-keypad |
1620 | estimated_duration: 120.0 |
1621 | -depends: suspend/suspend_advanced |
1622 | +depends: suspend/suspend_advanced_auto |
1623 | command: keyboard_test.py |
1624 | _description: |
1625 | PURPOSE: |
1626 | @@ -1453,7 +1453,7 @@ _description: |
1627 | plugin: manual |
1628 | category_id: com.canonical.plainbox::suspend |
1629 | id: suspend/led_after_suspend/caps-lock |
1630 | -depends: suspend/suspend_advanced |
1631 | +depends: suspend/suspend_advanced_auto |
1632 | estimated_duration: 120.0 |
1633 | _description: |
1634 | PURPOSE: |
1635 | @@ -1467,7 +1467,7 @@ _description: |
1636 | plugin: manual |
1637 | category_id: com.canonical.plainbox::suspend |
1638 | id: suspend/led_after_suspend/wlan |
1639 | -depends: suspend/suspend_advanced |
1640 | +depends: suspend/suspend_advanced_auto |
1641 | estimated_duration: 120.0 |
1642 | _description: |
1643 | PURPOSE: |
1644 | @@ -1481,7 +1481,7 @@ _description: |
1645 | plugin: manual |
1646 | category_id: com.canonical.plainbox::suspend |
1647 | id: suspend/led_after_suspend/wlan-disabled |
1648 | -depends: suspend/suspend_advanced |
1649 | +depends: suspend/suspend_advanced_auto |
1650 | estimated_duration: 120.0 |
1651 | _description: |
1652 | PURPOSE: |
1653 | @@ -1497,7 +1497,7 @@ _description: |
1654 | plugin: manual |
1655 | category_id: com.canonical.plainbox::suspend |
1656 | id: suspend/led_after_suspend/bluetooth |
1657 | -depends: suspend/suspend_advanced |
1658 | +depends: suspend/suspend_advanced_auto |
1659 | estimated_duration: 120.0 |
1660 | _description: |
1661 | PURPOSE: |
1662 | @@ -1513,7 +1513,7 @@ _description: |
1663 | plugin: manual |
1664 | category_id: com.canonical.plainbox::suspend |
1665 | id: suspend/led_after_suspend/touchpad |
1666 | -depends: suspend/suspend_advanced |
1667 | +depends: suspend/suspend_advanced_auto |
1668 | estimated_duration: 120.0 |
1669 | _description: |
1670 | PURPOSE: |
1671 | @@ -1529,7 +1529,7 @@ _description: |
1672 | plugin: manual |
1673 | category_id: com.canonical.plainbox::suspend |
1674 | id: suspend/led_after_suspend/wireless |
1675 | -depends: suspend/suspend_advanced |
1676 | +depends: suspend/suspend_advanced_auto |
1677 | estimated_duration: 120.0 |
1678 | _description: |
1679 | PURPOSE: |
1680 | @@ -1549,7 +1549,7 @@ category_id: com.canonical.plainbox::suspend |
1681 | id: suspend/usb_insert_after_suspend |
1682 | estimated_duration: 30.0 |
1683 | depends: |
1684 | - suspend/suspend_advanced |
1685 | + suspend/suspend_advanced_auto |
1686 | command: removable_storage_watcher.py insert usb |
1687 | _purpose: |
1688 | This test will check that the system correctly detects the insertion of |
1689 | @@ -1571,7 +1571,7 @@ estimated_duration: 30.0 |
1690 | requires: |
1691 | usb.usb3 == 'supported' |
1692 | depends: |
1693 | - suspend/suspend_advanced |
1694 | + suspend/suspend_advanced_auto |
1695 | command: removable_storage_watcher.py -m 500000000 insert usb |
1696 | _purpose: |
1697 | This test will check that the system correctly detects the insertion of |
1698 | @@ -1676,7 +1676,7 @@ plugin: user-interact |
1699 | category_id: com.canonical.plainbox::suspend |
1700 | id: suspend/mmc-insert-after-suspend |
1701 | estimated_duration: 30.0 |
1702 | -depends: suspend/suspend_advanced |
1703 | +depends: suspend/suspend_advanced_auto |
1704 | imports: from com.canonical.plainbox import manifest |
1705 | requires: |
1706 | package.name == 'udisks2' or snap.name == 'udisks2' |
1707 | @@ -1727,7 +1727,7 @@ plugin: user-interact |
1708 | category_id: com.canonical.plainbox::suspend |
1709 | id: suspend/sd-insert-after-suspend |
1710 | estimated_duration: 30.0 |
1711 | -depends: suspend/suspend_advanced |
1712 | +depends: suspend/suspend_advanced_auto |
1713 | imports: from com.canonical.plainbox import manifest |
1714 | requires: |
1715 | package.name == 'udisks2' or snap.name == 'udisks2' |
1716 | @@ -1780,7 +1780,7 @@ plugin: user-interact |
1717 | category_id: com.canonical.plainbox::suspend |
1718 | id: suspend/sdhc-insert-after-suspend |
1719 | estimated_duration: 30.0 |
1720 | -depends: suspend/suspend_advanced |
1721 | +depends: suspend/suspend_advanced_auto |
1722 | imports: from com.canonical.plainbox import manifest |
1723 | requires: |
1724 | package.name == 'udisks2' or snap.name == 'udisks2' |
1725 | @@ -1832,7 +1832,7 @@ plugin: user-interact |
1726 | category_id: com.canonical.plainbox::suspend |
1727 | id: mediacard/cf-insert-after-suspend |
1728 | estimated_duration: 30.0 |
1729 | -depends: suspend/suspend_advanced |
1730 | +depends: suspend/suspend_advanced_auto |
1731 | imports: from com.canonical.plainbox import manifest |
1732 | requires: |
1733 | package.name == 'udisks2' or snap.name == 'udisks2' |
1734 | @@ -1883,7 +1883,7 @@ plugin: user-interact |
1735 | category_id: com.canonical.plainbox::suspend |
1736 | id: mediacard/sdxc-insert-after-suspend |
1737 | estimated_duration: 30.0 |
1738 | -depends: suspend/suspend_advanced |
1739 | +depends: suspend/suspend_advanced_auto |
1740 | imports: from com.canonical.plainbox import manifest |
1741 | requires: |
1742 | package.name == 'udisks2' or snap.name == 'udisks2' |
1743 | @@ -1934,7 +1934,7 @@ plugin: user-interact |
1744 | category_id: com.canonical.plainbox::suspend |
1745 | id: mediacard/ms-insert-after-suspend |
1746 | estimated_duration: 30.0 |
1747 | -depends: suspend/suspend_advanced |
1748 | +depends: suspend/suspend_advanced_auto |
1749 | imports: from com.canonical.plainbox import manifest |
1750 | requires: |
1751 | package.name == 'udisks2' or snap.name == 'udisks2' |
1752 | @@ -1985,7 +1985,7 @@ plugin: user-interact |
1753 | category_id: com.canonical.plainbox::suspend |
1754 | id: mediacard/msp-insert-after-suspend |
1755 | estimated_duration: 30.0 |
1756 | -depends: suspend/suspend_advanced |
1757 | +depends: suspend/suspend_advanced_auto |
1758 | imports: from com.canonical.plainbox import manifest |
1759 | requires: |
1760 | package.name == 'udisks2' or snap.name == 'udisks2' |
1761 | @@ -2036,7 +2036,7 @@ plugin: user-interact |
1762 | category_id: com.canonical.plainbox::suspend |
1763 | id: mediacard/xd-insert-after-suspend |
1764 | estimated_duration: 30.0 |
1765 | -depends: suspend/suspend_advanced |
1766 | +depends: suspend/suspend_advanced_auto |
1767 | imports: from com.canonical.plainbox import manifest |
1768 | requires: |
1769 | package.name == 'udisks2' or snap.name == 'udisks2' |
1770 | @@ -2116,7 +2116,7 @@ template-filter: device.category == 'MOUSE' or device.category == 'TOUCHPAD' or |
1771 | plugin: manual |
1772 | category_id: com.canonical.plainbox::suspend |
1773 | id: suspend/pointing-after-suspend_{product_slug}_{category}_{__index__} |
1774 | -depends: suspend/suspend_advanced |
1775 | +depends: suspend/suspend_advanced_auto |
1776 | _description: |
1777 | PURPOSE: |
1778 | This will test your {product} device after suspend. |
1779 | @@ -2132,7 +2132,7 @@ plugin: manual |
1780 | category_id: com.canonical.plainbox::suspend |
1781 | estimated_duration: 30.0 |
1782 | id: suspend/clicking-after-suspend_{product_slug}_{category}_{__index__} |
1783 | -depends: suspend/suspend_advanced |
1784 | +depends: suspend/suspend_advanced_auto |
1785 | _summary: Check post suspend button functionality for {product} |
1786 | _description: |
1787 | PURPOSE: |
1788 | @@ -2161,7 +2161,7 @@ _summary: Test OpenGL support for {product} after suspend |
1789 | plugin: shell |
1790 | category_id: com.canonical.plainbox::suspend |
1791 | id: suspend/gl_support_after_suspend |
1792 | -depends: suspend/suspend_advanced |
1793 | +depends: suspend/suspend_advanced_auto |
1794 | requires: package.name == 'nux-tools' |
1795 | command: /usr/lib/nux/unity_support_test -p 2>&1 |
1796 | estimated_duration: 0.130 |
1797 | @@ -2190,7 +2190,7 @@ _description: |
1798 | plugin: user-interact-verify |
1799 | category_id: com.canonical.plainbox::suspend |
1800 | id: suspend/glxgears_after_suspend |
1801 | -depends: suspend/suspend_advanced |
1802 | +depends: suspend/suspend_advanced_auto |
1803 | requires: |
1804 | executable.name == 'glxgears' |
1805 | device.category == 'VIDEO' |
1806 | @@ -2228,7 +2228,7 @@ _description: |
1807 | id: suspend/video_after_suspend |
1808 | plugin: user-interact-verify |
1809 | category_id: com.canonical.plainbox::suspend |
1810 | -depends: suspend/suspend_advanced |
1811 | +depends: suspend/suspend_advanced_auto |
1812 | requires: |
1813 | device.category == 'VIDEO' |
1814 | package.name == 'xorg' |
1815 | @@ -2257,7 +2257,7 @@ _summary: Test X driver/version after suspend for {vendor} {product} |
1816 | |
1817 | id: suspend/driver_version_after_suspend |
1818 | requires: device.category == 'VIDEO' |
1819 | -depends: suspend/suspend_advanced |
1820 | +depends: suspend/suspend_advanced_auto |
1821 | plugin: shell |
1822 | category_id: com.canonical.plainbox::suspend |
1823 | command: graphics_driver |
1824 | @@ -2266,7 +2266,7 @@ _description: Parses Xorg.0.Log and discovers the running X driver and version a |
1825 | _summary: Test X driver/version after suspend |
1826 | |
1827 | id: suspend/oops_after_suspend |
1828 | -depends: suspend/suspend_advanced |
1829 | +depends: suspend/suspend_advanced_auto |
1830 | plugin:shell |
1831 | estimated_duration: 10.0 |
1832 | requires: executable.name == 'fwts' |
1833 | diff --git a/units/suspend/test-plan.pxu b/units/suspend/test-plan.pxu |
1834 | index 66b38a2..5d1cfeb 100644 |
1835 | --- a/units/suspend/test-plan.pxu |
1836 | +++ b/units/suspend/test-plan.pxu |
1837 | @@ -126,7 +126,7 @@ _description: |
1838 | execution order, by placing it between before-suspend-tp and after-suspend-tp |
1839 | in the nested_part section of the surrounding test plan. |
1840 | include: |
1841 | - suspend/suspend_advanced |
1842 | + suspend/suspend_advanced_auto |
1843 | |
1844 | id: hibernate-tp-manual |
1845 | unit: test plan |
1846 | diff --git a/units/thunderbolt/jobs.pxu b/units/thunderbolt/jobs.pxu |
1847 | index 031c2ad..a2bbf75 100644 |
1848 | --- a/units/thunderbolt/jobs.pxu |
1849 | +++ b/units/thunderbolt/jobs.pxu |
1850 | @@ -6,9 +6,9 @@ requires: manifest.has_thunderbolt == 'True' |
1851 | estimated_duration: 20.0 |
1852 | command: removable_storage_watcher.py insert --timeout 40 scsi |
1853 | _siblings: [ |
1854 | - { "id": "after-suspend-manual-thunderbolt/insert", |
1855 | + { "id": "after-suspend-thunderbolt/insert", |
1856 | "_summary": "thunderbolt/insert after suspend", |
1857 | - "depends": "suspend/suspend_advanced"} |
1858 | + "depends": "suspend/suspend_advanced_auto"} |
1859 | ] |
1860 | _summary: Storage insert detection on Thunderbolt |
1861 | _description: |
1862 | @@ -33,9 +33,9 @@ depends: thunderbolt/insert |
1863 | estimated_duration: 45.0 |
1864 | command: removable_storage_test.py -s 268400000 scsi |
1865 | _siblings: [ |
1866 | - { "id": "after-suspend-manual-thunderbolt/storage-test", |
1867 | + { "id": "after-suspend-thunderbolt/storage-test", |
1868 | "_summary": "thunderbolt/storage-test after suspend", |
1869 | - "depends": "after-suspend-manual-thunderbolt/insert"} |
1870 | + "depends": "after-suspend-thunderbolt/insert"} |
1871 | ] |
1872 | _summary: Storage test on Thunderbolt |
1873 | _description: |
1874 | @@ -52,9 +52,9 @@ estimated_duration: 10.0 |
1875 | command: removable_storage_watcher.py remove scsi |
1876 | _summary: Storage removal detection on Thunderbolt |
1877 | _siblings: [ |
1878 | - { "id": "after-suspend-manual-thunderbolt/remove", |
1879 | + { "id": "after-suspend-thunderbolt/remove", |
1880 | "_summary": "thunderbolt/remove after suspend", |
1881 | - "depends": "after-suspend-manual-thunderbolt/insert"} |
1882 | + "depends": "after-suspend-thunderbolt/insert"} |
1883 | ] |
1884 | _description: |
1885 | PURPOSE: |
1886 | @@ -72,7 +72,7 @@ category_id: com.canonical.plainbox::disk |
1887 | id: thunderbolt/daisy-chain |
1888 | imports: from com.canonical.plainbox import manifest |
1889 | requires: manifest.has_thunderbolt == 'True' |
1890 | -flags: also-after-suspend-manual |
1891 | +flags: also-after-suspend |
1892 | estimated_duration: 45.0 |
1893 | command: removable_storage_test.py -s 268400000 scsi |
1894 | _summary: Daisy-chain testing for Thunderbolt storage and display device |
1895 | @@ -98,9 +98,9 @@ requires: manifest.has_thunderbolt3 == 'True' |
1896 | estimated_duration: 20.0 |
1897 | command: removable_storage_watcher.py insert --timeout 40 scsi |
1898 | _siblings: [ |
1899 | - { "id": "after-suspend-manual-thunderbolt3/insert", |
1900 | + { "id": "after-suspend-thunderbolt3/insert", |
1901 | "_summary": "thunderbolt3/insert after suspend", |
1902 | - "depends": "suspend/suspend_advanced"} |
1903 | + "depends": "suspend/suspend_advanced_auto"} |
1904 | ] |
1905 | _summary: Storage insert detection on Thunderbolt 3 port |
1906 | _description: |
1907 | @@ -125,9 +125,9 @@ depends: thunderbolt3/insert |
1908 | estimated_duration: 45.0 |
1909 | command: removable_storage_test.py -s 268400000 scsi |
1910 | _siblings: [ |
1911 | - { "id": "after-suspend-manual-thunderbolt3/storage-test", |
1912 | + { "id": "after-suspend-thunderbolt3/storage-test", |
1913 | "_summary": "thunderbolt3/storage-test after suspend", |
1914 | - "depends": "after-suspend-manual-thunderbolt3/insert"} |
1915 | + "depends": "after-suspend-thunderbolt3/insert"} |
1916 | ] |
1917 | _summary: Storage test on Thunderbolt 3 |
1918 | _description: |
1919 | @@ -157,9 +157,9 @@ depends: thunderbolt3/insert |
1920 | estimated_duration: 10.0 |
1921 | command: removable_storage_watcher.py remove scsi |
1922 | _siblings: [ |
1923 | - { "id": "after-suspend-manual-thunderbolt3/remove", |
1924 | + { "id": "after-suspend-thunderbolt3/remove", |
1925 | "_summary": "thunderbolt3/remove after suspend", |
1926 | - "depends": "after-suspend-manual-thunderbolt3/insert"} |
1927 | + "depends": "after-suspend-thunderbolt3/insert"} |
1928 | ] |
1929 | _summary: Storage removal detection on Thunderbolt 3 port |
1930 | _description: |
1931 | @@ -179,7 +179,7 @@ id: thunderbolt3/daisy-chain |
1932 | user: root |
1933 | imports: from com.canonical.plainbox import manifest |
1934 | requires: manifest.has_thunderbolt3 == 'True' |
1935 | -flags: also-after-suspend-manual |
1936 | +flags: also-after-suspend |
1937 | estimated_duration: 45.0 |
1938 | command: removable_storage_test.py -s 268400000 scsi |
1939 | _summary: Daisy-chain testing for Thunderbolt 3 storage and display device |
1940 | diff --git a/units/thunderbolt/test-plan.pxu b/units/thunderbolt/test-plan.pxu |
1941 | index 209e9c7..d876201 100644 |
1942 | --- a/units/thunderbolt/test-plan.pxu |
1943 | +++ b/units/thunderbolt/test-plan.pxu |
1944 | @@ -50,15 +50,15 @@ _name: Thunderbolt tests (after suspend Manual) |
1945 | _description: |
1946 | Thunderbolt tests (after suspend Manual) |
1947 | include: |
1948 | - after-suspend-manual-thunderbolt3/insert certification-status=blocker |
1949 | - after-suspend-manual-thunderbolt3/storage-test certification-status=blocker |
1950 | - after-suspend-manual-thunderbolt3/remove certification-status=blocker |
1951 | + after-suspend-thunderbolt3/insert certification-status=blocker |
1952 | + after-suspend-thunderbolt3/storage-test certification-status=blocker |
1953 | + after-suspend-thunderbolt3/remove certification-status=blocker |
1954 | |
1955 | id: after-suspend-thunderbolt-cert-blockers |
1956 | unit: test plan |
1957 | _name: Thunderbolt tests (after suspend - certification blockers only) |
1958 | _description: Thunderbolt tests (after suspend - certification blockers only) |
1959 | include: |
1960 | - after-suspend-manual-thunderbolt3/insert certification-status=blocker |
1961 | - after-suspend-manual-thunderbolt3/storage-test certification-status=blocker |
1962 | - after-suspend-manual-thunderbolt3/remove certification-status=blocker |
1963 | \ No newline at end of file |
1964 | + after-suspend-thunderbolt3/insert certification-status=blocker |
1965 | + after-suspend-thunderbolt3/storage-test certification-status=blocker |
1966 | + after-suspend-thunderbolt3/remove certification-status=blocker |
1967 | diff --git a/units/touchpad/jobs.pxu b/units/touchpad/jobs.pxu |
1968 | index 220b3c9..95dfc5b 100644 |
1969 | --- a/units/touchpad/jobs.pxu |
1970 | +++ b/units/touchpad/jobs.pxu |
1971 | @@ -12,7 +12,7 @@ _verification: |
1972 | Did the cursor move? |
1973 | _siblings: |
1974 | [{ "id": "touchpad/basic-after-suspend", |
1975 | - "depends": "suspend/suspend_advanced touchpad/basic" }] |
1976 | + "depends": "suspend/suspend_advanced_auto touchpad/basic" }] |
1977 | |
1978 | plugin: user-interact |
1979 | category_id: com.canonical.plainbox::touchpad |
1980 | @@ -31,7 +31,7 @@ _verification: |
1981 | Could you scroll right and left? |
1982 | _siblings: |
1983 | [{ "id": "touchpad/horizontal-after-suspend", |
1984 | - "depends": "suspend/suspend_advanced touchpad/horizontal" }] |
1985 | + "depends": "suspend/suspend_advanced_auto touchpad/horizontal" }] |
1986 | |
1987 | plugin: user-interact |
1988 | category_id: com.canonical.plainbox::touchpad |
1989 | @@ -50,7 +50,7 @@ _verification: |
1990 | Could you scroll up and down? |
1991 | _siblings: |
1992 | [{ "id": "touchpad/vertical-after-suspend", |
1993 | - "depends": "suspend/suspend_advanced touchpad/vertical" }] |
1994 | + "depends": "suspend/suspend_advanced_auto touchpad/vertical" }] |
1995 | |
1996 | plugin: manual |
1997 | category_id: com.canonical.plainbox::touchpad |
1998 | @@ -65,7 +65,7 @@ _verification: |
1999 | Is the touchpad supposed to be multitouch? |
2000 | _siblings: |
2001 | [{ "id": "touchpad/multitouch-manual-after-suspend", |
2002 | - "depends": "suspend/suspend_advanced touchpad/multitouch-manual" }] |
2003 | + "depends": "suspend/suspend_advanced_auto touchpad/multitouch-manual" }] |
2004 | |
2005 | plugin: manual |
2006 | category_id: com.canonical.plainbox::touchpad |
2007 | @@ -81,7 +81,7 @@ _verification: |
2008 | Did a selection window open and were several files selected? |
2009 | _siblings: |
2010 | [{ "id": "touchpad/singletouch-selection-after-suspend", |
2011 | - "depends": "suspend/suspend_advanced touchpad/singletouch-selection" }] |
2012 | + "depends": "suspend/suspend_advanced_auto touchpad/singletouch-selection" }] |
2013 | |
2014 | plugin: manual |
2015 | category_id: com.canonical.plainbox::touchpad |
2016 | @@ -98,7 +98,7 @@ _verification: |
2017 | Did the right click pop up menu appear? |
2018 | _siblings: |
2019 | [{ "id": "touchpad/multitouch-rightclick-after-suspend", |
2020 | - "depends": "suspend/suspend_advanced touchpad/multitouch-rightclick" }] |
2021 | + "depends": "suspend/suspend_advanced_auto touchpad/multitouch-rightclick" }] |
2022 | |
2023 | plugin: user-interact |
2024 | category_id: com.canonical.plainbox::touchpad |
2025 | @@ -115,7 +115,7 @@ _verification: |
2026 | Could you scroll right and left? |
2027 | _siblings: |
2028 | [{ "id": "touchpad/multitouch-horizontal-after-suspend", |
2029 | - "depends": "suspend/suspend_advanced touchpad/multitouch-horizontal" }] |
2030 | + "depends": "suspend/suspend_advanced_auto touchpad/multitouch-horizontal" }] |
2031 | |
2032 | plugin: user-interact |
2033 | category_id: com.canonical.plainbox::touchpad |
2034 | @@ -132,7 +132,7 @@ _verification: |
2035 | Could you scroll up and down? |
2036 | _siblings: |
2037 | [{ "id": "touchpad/multitouch-vertical-after-suspend", |
2038 | - "depends": "suspend/suspend_advanced touchpad/multitouch-vertical" }] |
2039 | + "depends": "suspend/suspend_advanced_auto touchpad/multitouch-vertical" }] |
2040 | |
2041 | plugin: manual |
2042 | category_id: com.canonical.plainbox::touchpad |
2043 | @@ -150,7 +150,7 @@ _verification: |
2044 | Does drag and drop work on Touchpad? |
2045 | _siblings: |
2046 | [{ "id": "touchpad/drag-and-drop-after-suspend", |
2047 | - "depends": "suspend/suspend_advanced touchpad/drag-and-drop" }] |
2048 | + "depends": "suspend/suspend_advanced_auto touchpad/drag-and-drop" }] |
2049 | |
2050 | plugin: manual |
2051 | category_id: com.canonical.plainbox::touchpad |
2052 | @@ -181,7 +181,7 @@ _verification: |
2053 | Did the tap open the Dash? |
2054 | _siblings: |
2055 | [{ "id": "touchpad/multitouch-dash-after-suspend", |
2056 | - "depends": "suspend/suspend_advanced touchpad/multitouch-dash", |
2057 | + "depends": "suspend/suspend_advanced_auto touchpad/multitouch-dash", |
2058 | "_summary": "Check 4-finger tap gesture after suspend (S3)" }] |
2059 | |
2060 | plugin: shell |
2061 | @@ -200,7 +200,7 @@ _purpose: |
2062 | This test will check if your touchpad was detected as a mouse. |
2063 | _siblings: |
2064 | [{ "id": "touchpad/detected-as-mouse-after-suspend", |
2065 | - "depends": "suspend/suspend_advanced touchpad/detected-as-mouse" }] |
2066 | + "depends": "suspend/suspend_advanced_auto touchpad/detected-as-mouse" }] |
2067 | |
2068 | plugin: user-interact |
2069 | category_id: com.canonical.plainbox::touchpad |
2070 | @@ -217,7 +217,7 @@ _verification: |
2071 | Did the mouse cursor move without interruption? |
2072 | _siblings: |
2073 | [{ "id": "touchpad/continuous-move-after-suspend", |
2074 | - "depends": "suspend/suspend_advanced touchpad/continuous-move" }] |
2075 | + "depends": "suspend/suspend_advanced_auto touchpad/continuous-move" }] |
2076 | |
2077 | unit: template |
2078 | template-resource: device |
2079 | @@ -247,5 +247,5 @@ _verification: |
2080 | Cursor should not have moved. |
2081 | _siblings: |
2082 | [{ "id": "touchpad/palm-rejection-after-suspend", |
2083 | - "depends": "suspend/suspend_advanced touchpad/palm-rejection" }] |
2084 | + "depends": "suspend/suspend_advanced_auto touchpad/palm-rejection" }] |
2085 | estimated_duration: 40 |
2086 | diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu |
2087 | index 060e0c6..8618e2c 100644 |
2088 | --- a/units/touchscreen/jobs.pxu |
2089 | +++ b/units/touchscreen/jobs.pxu |
2090 | @@ -62,7 +62,7 @@ _description: |
2091 | 5. Drag and drop the Screenshot* files to Home folder |
2092 | VERIFICATION: |
2093 | Does drag and drop work? |
2094 | -flags: also-after-suspend-manual |
2095 | +flags: also-after-suspend |
2096 | |
2097 | plugin: user-interact-verify |
2098 | category_id: com.canonical.plainbox::touchscreen |
2099 | @@ -80,7 +80,7 @@ _description: |
2100 | 2. Using 2 fingers, resize the blue square until it turns green, then release it. |
2101 | VERIFICATION: |
2102 | Did the blue square change size following the gesture? |
2103 | -flags: also-after-suspend-manual |
2104 | +flags: also-after-suspend |
2105 | |
2106 | plugin: user-interact-verify |
2107 | category_id: com.canonical.plainbox::touchscreen |
2108 | @@ -98,7 +98,7 @@ _description: |
2109 | 2. Using 2 fingers, rotate the blue square until it turns green, then release it. |
2110 | VERIFICATION: |
2111 | Did the blue square rotate following the gesture? |
2112 | -flags: also-after-suspend-manual |
2113 | +flags: also-after-suspend |
2114 | |
2115 | plugin: manual |
2116 | category_id: com.canonical.plainbox::touchscreen |
2117 | @@ -164,7 +164,7 @@ command: |
2118 | EXIT=$? |
2119 | {% endif %} |
2120 | exit $EXIT |
2121 | -flags: also-after-suspend-manual |
2122 | +flags: also-after-suspend |
2123 | |
2124 | plugin: user-interact-verify |
2125 | template-engine: jinja2 |
2126 | @@ -199,7 +199,7 @@ command: |
2127 | EXIT=$? |
2128 | {% endif %} |
2129 | exit $EXIT |
2130 | -flags: also-after-suspend-manual |
2131 | +flags: also-after-suspend |
2132 | |
2133 | unit: template |
2134 | template-resource: device |
2135 | diff --git a/units/touchscreen/test-plan.pxu b/units/touchscreen/test-plan.pxu |
2136 | index f53e3dd..44db4be 100644 |
2137 | --- a/units/touchscreen/test-plan.pxu |
2138 | +++ b/units/touchscreen/test-plan.pxu |
2139 | @@ -43,11 +43,11 @@ _name: Touchscreen tests (Manual) |
2140 | _description: |
2141 | Touchscreen tests (Manual) |
2142 | include: |
2143 | - after-suspend-manual-touchscreen/drag-n-drop certification-status=blocker |
2144 | - after-suspend-manual-touchscreen/multitouch-zoom certification-status=blocker |
2145 | - after-suspend-manual-touchscreen/multitouch-rotate |
2146 | - after-suspend-manual-touchscreen/3-touch-tap certification-status=blocker |
2147 | - after-suspend-manual-touchscreen/4-touch-tap certification-status=blocker |
2148 | + after-suspend-touchscreen/drag-n-drop certification-status=blocker |
2149 | + after-suspend-touchscreen/multitouch-zoom certification-status=blocker |
2150 | + after-suspend-touchscreen/multitouch-rotate |
2151 | + after-suspend-touchscreen/3-touch-tap certification-status=blocker |
2152 | + after-suspend-touchscreen/4-touch-tap certification-status=blocker |
2153 | |
2154 | id: after-suspend-touchscreen-cert-automated |
2155 | unit: test plan |
2156 | @@ -71,10 +71,10 @@ unit: test plan |
2157 | _name: Touchscreen tests (after suspend, certification blockers only) |
2158 | _description: Touchscreen tests (after suspend, certification blockers only) |
2159 | include: |
2160 | - after-suspend-manual-touchscreen/drag-n-drop certification-status=blocker |
2161 | - after-suspend-manual-touchscreen/multitouch-zoom certification-status=blocker |
2162 | - after-suspend-manual-touchscreen/3-touch-tap certification-status=blocker |
2163 | - after-suspend-manual-touchscreen/4-touch-tap certification-status=blocker |
2164 | + after-suspend-touchscreen/drag-n-drop certification-status=blocker |
2165 | + after-suspend-touchscreen/multitouch-zoom certification-status=blocker |
2166 | + after-suspend-touchscreen/3-touch-tap certification-status=blocker |
2167 | + after-suspend-touchscreen/4-touch-tap certification-status=blocker |
2168 | |
2169 | id: touchscreen-evdev |
2170 | unit: test plan |
2171 | diff --git a/units/usb/test-plan.pxu b/units/usb/test-plan.pxu |
2172 | index 690204e..5d7f05f 100644 |
2173 | --- a/units/usb/test-plan.pxu |
2174 | +++ b/units/usb/test-plan.pxu |
2175 | @@ -94,15 +94,15 @@ unit: test plan |
2176 | _name: USB Type-C tests (after suspend) |
2177 | _description: USB Type-C tests (after suspend) |
2178 | include: |
2179 | - after-suspend-manual-usb-c/c-to-a-adapter/hid certification-status=blocker |
2180 | - after-suspend-manual-usb-c/c-to-a-adapter/insert certification-status=blocker |
2181 | - after-suspend-manual-usb-c/c-to-a-adapter/storage-automated certification-status=blocker |
2182 | - after-suspend-manual-usb-c/c-to-a-adapter/remove certification-status=blocker |
2183 | - after-suspend-manual-usb-c/hid certification-status=blocker |
2184 | - after-suspend-manual-usb-c/insert certification-status=blocker |
2185 | - after-suspend-manual-usb-c/storage-automated certification-status=blocker |
2186 | - after-suspend-manual-usb-c/remove certification-status=blocker |
2187 | - after-suspend-manual-usb-c/c-to-ethernet-adapter-insert |
2188 | + after-suspend-usb-c/c-to-a-adapter/hid certification-status=blocker |
2189 | + after-suspend-usb-c/c-to-a-adapter/insert certification-status=blocker |
2190 | + after-suspend-usb-c/c-to-a-adapter/storage-automated certification-status=blocker |
2191 | + after-suspend-usb-c/c-to-a-adapter/remove certification-status=blocker |
2192 | + after-suspend-usb-c/hid certification-status=blocker |
2193 | + after-suspend-usb-c/insert certification-status=blocker |
2194 | + after-suspend-usb-c/storage-automated certification-status=blocker |
2195 | + after-suspend-usb-c/remove certification-status=blocker |
2196 | + after-suspend-usb-c/c-to-ethernet-adapter-insert |
2197 | |
2198 | id: usb-cert-blockers |
2199 | unit: test plan |
2200 | @@ -161,14 +161,14 @@ unit: test plan |
2201 | _name: USB Type-C tests (after suspend, certification blockers only) |
2202 | _description: USB Type-C tests (after suspend, certification blockers only) |
2203 | include: |
2204 | - after-suspend-manual-usb-c/c-to-a-adapter/hid certification-status=blocker |
2205 | - after-suspend-manual-usb-c/c-to-a-adapter/insert certification-status=blocker |
2206 | - after-suspend-manual-usb-c/c-to-a-adapter/storage-automated certification-status=blocker |
2207 | - after-suspend-manual-usb-c/c-to-a-adapter/remove certification-status=blocker |
2208 | - after-suspend-manual-usb-c/hid certification-status=blocker |
2209 | - after-suspend-manual-usb-c/insert certification-status=blocker |
2210 | - after-suspend-manual-usb-c/storage-automated certification-status=blocker |
2211 | - after-suspend-manual-usb-c/remove certification-status=blocker |
2212 | + after-suspend-usb-c/c-to-a-adapter/hid certification-status=blocker |
2213 | + after-suspend-usb-c/c-to-a-adapter/insert certification-status=blocker |
2214 | + after-suspend-usb-c/c-to-a-adapter/storage-automated certification-status=blocker |
2215 | + after-suspend-usb-c/c-to-a-adapter/remove certification-status=blocker |
2216 | + after-suspend-usb-c/hid certification-status=blocker |
2217 | + after-suspend-usb-c/insert certification-status=blocker |
2218 | + after-suspend-usb-c/storage-automated certification-status=blocker |
2219 | + after-suspend-usb-c/remove certification-status=blocker |
2220 | |
2221 | id: usb-preinserted |
2222 | unit: test plan |
2223 | diff --git a/units/usb/usb-c.pxu b/units/usb/usb-c.pxu |
2224 | index 9ec912a..31f21ad 100644 |
2225 | --- a/units/usb/usb-c.pxu |
2226 | +++ b/units/usb/usb-c.pxu |
2227 | @@ -10,7 +10,7 @@ _steps: |
2228 | _verification: |
2229 | Did the device work as expected? |
2230 | plugin: manual |
2231 | -flags: also-after-suspend-manual |
2232 | +flags: also-after-suspend |
2233 | category_id: com.canonical.plainbox::usb |
2234 | imports: from com.canonical.plainbox import manifest |
2235 | requires: manifest.has_usb_type_c == 'True' |
2236 | @@ -32,7 +32,7 @@ _verification: |
2237 | The verification of this test is automated. Do not change the |
2238 | automatically selected result. |
2239 | plugin: user-interact |
2240 | -flags: also-after-suspend-manual |
2241 | +flags: also-after-suspend |
2242 | user: root |
2243 | command: |
2244 | if [[ -v SNAP ]]; then |
2245 | @@ -52,7 +52,7 @@ _description: |
2246 | This test is automated and executes after the usb-c/c-to-a-adapter/insert test |
2247 | is run. |
2248 | plugin: shell |
2249 | -flags: also-after-suspend-manual |
2250 | +flags: also-after-suspend |
2251 | user: root |
2252 | command: |
2253 | if [[ -v SNAP ]]; then |
2254 | @@ -80,7 +80,7 @@ _verification: |
2255 | The verification of this test is automated. Do not change the |
2256 | automatically selected result. |
2257 | plugin: user-interact |
2258 | -flags: also-after-suspend-manual |
2259 | +flags: also-after-suspend |
2260 | user: root |
2261 | command: |
2262 | if [[ -v SNAP ]]; then |
2263 | @@ -107,7 +107,7 @@ _steps: |
2264 | _verification: |
2265 | Did the device work as expected? |
2266 | plugin: manual |
2267 | -flags: also-after-suspend-manual |
2268 | +flags: also-after-suspend |
2269 | category_id: com.canonical.plainbox::usb |
2270 | imports: from com.canonical.plainbox import manifest |
2271 | requires: manifest.has_usb_type_c == 'True' |
2272 | @@ -128,7 +128,7 @@ _verification: |
2273 | The verification of this test is automated. Do not change the |
2274 | automatically selected result. |
2275 | plugin: user-interact |
2276 | -flags: also-after-suspend-manual |
2277 | +flags: also-after-suspend |
2278 | user: root |
2279 | command: |
2280 | if [[ -v SNAP ]]; then |
2281 | @@ -149,7 +149,7 @@ _description: |
2282 | This test is automated and executes after the usb-c/insert test |
2283 | is run. |
2284 | plugin: shell |
2285 | -flags: also-after-suspend-manual |
2286 | +flags: also-after-suspend |
2287 | user: root |
2288 | command: |
2289 | if [[ -v SNAP ]]; then |
2290 | @@ -176,7 +176,7 @@ _verification: |
2291 | The verification of this test is automated. Do not change the |
2292 | automatically selected result. |
2293 | plugin: user-interact |
2294 | -flags: also-after-suspend-manual |
2295 | +flags: also-after-suspend |
2296 | user: root |
2297 | command: |
2298 | if [[ -v SNAP ]]; then |
2299 | @@ -193,7 +193,7 @@ estimated_duration: 30 |
2300 | |
2301 | id: usb-c/c-to-ethernet-adapter-insert |
2302 | plugin: user-interact |
2303 | -flags: also-after-suspend-manual |
2304 | +flags: also-after-suspend |
2305 | category_id: com.canonical.plainbox::usb |
2306 | imports: from com.canonical.plainbox import manifest |
2307 | requires: manifest.has_usb_type_c == 'True' |
2308 | diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu |
2309 | index 95ddf31..05349b8 100644 |
2310 | --- a/units/wireless/jobs.pxu |
2311 | +++ b/units/wireless/jobs.pxu |
2312 | @@ -25,7 +25,7 @@ category_id: com.canonical.plainbox::wireless |
2313 | estimated_duration: 6 |
2314 | _description: |
2315 | Check system can find a wireless network AP nearby |
2316 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2317 | +flags: preserve-locale also-after-suspend |
2318 | requires: |
2319 | {%- if __on_ubuntucore__ %} |
2320 | connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' |
2321 | @@ -48,7 +48,7 @@ command: |
2322 | wifi_nmcli_test.py secured {{ interface }} "$WPA_BG_SSID" "$WPA_BG_PSK" |
2323 | category_id: com.canonical.plainbox::wireless |
2324 | estimated_duration: 30.0 |
2325 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2326 | +flags: preserve-locale also-after-suspend |
2327 | requires: |
2328 | {%- if __on_ubuntucore__ %} |
2329 | connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' |
2330 | @@ -71,7 +71,7 @@ command: |
2331 | wifi_nmcli_test.py open {{ interface }} "$OPEN_BG_SSID" |
2332 | category_id: com.canonical.plainbox::wireless |
2333 | estimated_duration: 30.0 |
2334 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2335 | +flags: preserve-locale also-after-suspend |
2336 | requires: |
2337 | {%- if __on_ubuntucore__ %} |
2338 | connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' |
2339 | @@ -94,7 +94,7 @@ command: |
2340 | wifi_nmcli_test.py secured {{ interface }} "$WPA_N_SSID" "$WPA_N_PSK" |
2341 | category_id: com.canonical.plainbox::wireless |
2342 | estimated_duration: 30.0 |
2343 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2344 | +flags: preserve-locale also-after-suspend |
2345 | requires: |
2346 | {%- if __on_ubuntucore__ %} |
2347 | connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' |
2348 | @@ -117,7 +117,7 @@ command: |
2349 | wifi_nmcli_test.py open {{ interface }} "$OPEN_N_SSID" |
2350 | category_id: com.canonical.plainbox::wireless |
2351 | estimated_duration: 30.0 |
2352 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2353 | +flags: preserve-locale also-after-suspend |
2354 | requires: |
2355 | {%- if __on_ubuntucore__ %} |
2356 | connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' |
2357 | @@ -140,7 +140,7 @@ command: |
2358 | wifi_nmcli_test.py secured {{ interface }} "$WPA_AC_SSID" "$WPA_AC_PSK" |
2359 | category_id: com.canonical.plainbox::wireless |
2360 | estimated_duration: 30.0 |
2361 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2362 | +flags: preserve-locale also-after-suspend |
2363 | requires: |
2364 | wireless_sta_protocol.{{ interface }}_ac == 'supported' |
2365 | {%- if __on_ubuntucore__ %} |
2366 | @@ -164,7 +164,7 @@ command: |
2367 | wifi_nmcli_test.py open {{ interface }} "$OPEN_AC_SSID" |
2368 | category_id: com.canonical.plainbox::wireless |
2369 | estimated_duration: 30.0 |
2370 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2371 | +flags: preserve-locale also-after-suspend |
2372 | requires: |
2373 | wireless_sta_protocol.{{ interface }}_ac == 'supported' |
2374 | {%- if __on_ubuntucore__ %} |
2375 | @@ -188,7 +188,7 @@ command: |
2376 | wifi_nmcli_test.py secured {{ interface }} "$WPA_AX_SSID" "$WPA_AX_PSK" |
2377 | category_id: com.canonical.plainbox::wireless |
2378 | estimated_duration: 30.0 |
2379 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2380 | +flags: preserve-locale also-after-suspend |
2381 | requires: |
2382 | wireless_sta_protocol.{{ interface }}_ax == 'supported' |
2383 | {%- if __on_ubuntucore__ %} |
2384 | @@ -212,7 +212,7 @@ command: |
2385 | wifi_nmcli_test.py open {{ interface }} "$OPEN_AX_SSID" |
2386 | category_id: com.canonical.plainbox::wireless |
2387 | estimated_duration: 30.0 |
2388 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2389 | +flags: preserve-locale also-after-suspend |
2390 | requires: |
2391 | wireless_sta_protocol.{{ interface }}_ax == 'supported' |
2392 | {%- if __on_ubuntucore__ %} |
2393 | @@ -536,7 +536,7 @@ user: root |
2394 | command: |
2395 | wifi_nmcli_backup.py save |
2396 | estimated_duration: 2.0 |
2397 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2398 | +flags: preserve-locale also-after-suspend |
2399 | |
2400 | unit: template |
2401 | template-resource: device |
2402 | @@ -550,16 +550,4 @@ command: |
2403 | wifi_nmcli_backup.py restore |
2404 | estimated_duration: 2.0 |
2405 | depends: wireless/nm_connection_save_{interface} |
2406 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2407 | - |
2408 | -unit: template |
2409 | -template-resource: device |
2410 | -template-filter: device.driver == 'iwlwifi' |
2411 | -id: wireless/check_iwlwifi_microcode_crash_{interface} |
2412 | -_summary: Check there have been no iwlwifi crashes |
2413 | -plugin: shell |
2414 | -command: check-iwlwifi-microcode-sw-error.sh |
2415 | -category_id: com.canonical.plainbox::wireless |
2416 | -estimated_duration: 30.0 |
2417 | flags: preserve-locale also-after-suspend |
2418 | -requires: package.name == 'systemd' |
2419 | diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu |
2420 | index d0458cc..91fb07e 100644 |
2421 | --- a/units/wireless/test-plan.pxu |
2422 | +++ b/units/wireless/test-plan.pxu |
2423 | @@ -21,7 +21,7 @@ _name: Wireless tests (after suspend) |
2424 | _description: Wireless connection tests (after suspend) |
2425 | include: |
2426 | nested_part: |
2427 | - after-suspend-manual-wireless-cert-automated |
2428 | + after-suspend-wireless-cert-automated |
2429 | |
2430 | id: wireless-cert-automated |
2431 | unit: test plan |
2432 | @@ -62,24 +62,6 @@ include: |
2433 | after-suspend-wireless/nm_connection_restore_.* |
2434 | after-suspend-wireless/check_iwlwifi_microcode_crash_.* |
2435 | |
2436 | -id: after-suspend-manual-wireless-cert-automated |
2437 | -unit: test plan |
2438 | -_name: Wireless tests (after manual suspend, automated) |
2439 | -_description: Wireless connection tests (after manual suspend, automated) |
2440 | -bootstrap_include: |
2441 | - device |
2442 | -include: |
2443 | - after-suspend-manual-wireless/nm_connection_save_.* |
2444 | - after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker |
2445 | - after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker |
2446 | - after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker |
2447 | - after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker |
2448 | - after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker |
2449 | - after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker |
2450 | - after-suspend-manual-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker |
2451 | - after-suspend-manual-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker |
2452 | - after-suspend-manual-wireless/nm_connection_restore_.* |
2453 | - |
2454 | id: wireless-cert-blockers |
2455 | unit: test plan |
2456 | _name: Wireless tests (certification blockers only) |
2457 | @@ -107,16 +89,16 @@ _description: |
2458 | bootstrap_include: |
2459 | device |
2460 | include: |
2461 | - after-suspend-manual-wireless/nm_connection_save_.* |
2462 | - after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker |
2463 | - after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker |
2464 | - after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker |
2465 | - after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker |
2466 | - after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker |
2467 | - after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker |
2468 | - after-suspend-manual-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker |
2469 | - after-suspend-manual-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker |
2470 | - after-suspend-manual-wireless/nm_connection_restore_.* |
2471 | + after-suspend-wireless/nm_connection_save_.* |
2472 | + after-suspend-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker |
2473 | + after-suspend-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker |
2474 | + after-suspend-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker |
2475 | + after-suspend-wireless/wireless_connection_open_n_nm_.* certification-status=blocker |
2476 | + after-suspend-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker |
2477 | + after-suspend-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker |
2478 | + after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker |
2479 | + after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker |
2480 | + after-suspend-wireless/nm_connection_restore_.* |
2481 | |
2482 | id: wireless-full |
2483 | unit: test plan |
2484 | diff --git a/units/wireless/wireless-connection-netplan.pxu b/units/wireless/wireless-connection-netplan.pxu |
2485 | index 44677e2..12b29d8 100644 |
2486 | --- a/units/wireless/wireless-connection-netplan.pxu |
2487 | +++ b/units/wireless/wireless-connection-netplan.pxu |
2488 | @@ -16,7 +16,7 @@ user: root |
2489 | environ: LD_LIBRARY_PATH OPEN_AX_SSID NET_DRIVER_INFO |
2490 | category_id: com.canonical.plainbox::wireless |
2491 | estimated_duration: 15 |
2492 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2493 | +flags: preserve-locale also-after-suspend |
2494 | requires: |
2495 | wireless_sta_protocol.{{ interface }}_ax == 'supported' |
2496 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2497 | @@ -40,7 +40,7 @@ user: root |
2498 | environ: LD_LIBRARY_PATH OPEN_AC_SSID NET_DRIVER_INFO |
2499 | category_id: com.canonical.plainbox::wireless |
2500 | estimated_duration: 15 |
2501 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2502 | +flags: preserve-locale also-after-suspend |
2503 | requires: |
2504 | wireless_sta_protocol.{{ interface }}_ac == 'supported' |
2505 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2506 | @@ -65,7 +65,7 @@ user: root |
2507 | environ: LD_LIBRARY_PATH OPEN_BG_SSID NET_DRIVER_INFO |
2508 | category_id: com.canonical.plainbox::wireless |
2509 | estimated_duration: 15 |
2510 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2511 | +flags: preserve-locale also-after-suspend |
2512 | requires: |
2513 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2514 | |
2515 | @@ -88,7 +88,7 @@ user: root |
2516 | environ: LD_LIBRARY_PATH OPEN_N_SSID NET_DRIVER_INFO |
2517 | category_id: com.canonical.plainbox::wireless |
2518 | estimated_duration: 15 |
2519 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2520 | +flags: preserve-locale also-after-suspend |
2521 | requires: |
2522 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2523 | |
2524 | @@ -111,7 +111,7 @@ user: root |
2525 | environ: LD_LIBRARY_PATH WPA_AX_SSID WPA_AX_PSK NET_DRIVER_INFO |
2526 | category_id: com.canonical.plainbox::wireless |
2527 | estimated_duration: 15 |
2528 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2529 | +flags: preserve-locale also-after-suspend |
2530 | requires: |
2531 | wireless_sta_protocol.{{ interface }}_ax == 'supported' |
2532 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2533 | @@ -135,7 +135,7 @@ user: root |
2534 | environ: LD_LIBRARY_PATH WPA_AC_SSID WPA_AC_PSK NET_DRIVER_INFO |
2535 | category_id: com.canonical.plainbox::wireless |
2536 | estimated_duration: 15 |
2537 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2538 | +flags: preserve-locale also-after-suspend |
2539 | requires: |
2540 | wireless_sta_protocol.{{ interface }}_ac == 'supported' |
2541 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2542 | @@ -159,7 +159,7 @@ user: root |
2543 | environ: LD_LIBRARY_PATH WPA_BG_SSID WPA_BG_PSK NET_DRIVER_INFO |
2544 | category_id: com.canonical.plainbox::wireless |
2545 | estimated_duration: 15 |
2546 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2547 | +flags: preserve-locale also-after-suspend |
2548 | requires: |
2549 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2550 | |
2551 | @@ -182,6 +182,6 @@ user: root |
2552 | environ: LD_LIBRARY_PATH WPA_N_SSID WPA_N_PSK NET_DRIVER_INFO |
2553 | category_id: com.canonical.plainbox::wireless |
2554 | estimated_duration: 15 |
2555 | -flags: preserve-locale also-after-suspend also-after-suspend-manual |
2556 | +flags: preserve-locale also-after-suspend |
2557 | requires: |
2558 | net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' |
2559 | diff --git a/units/wwan/jobs.pxu b/units/wwan/jobs.pxu |
2560 | index de4b1bc..93f9c68 100644 |
2561 | --- a/units/wwan/jobs.pxu |
2562 | +++ b/units/wwan/jobs.pxu |
2563 | @@ -110,7 +110,7 @@ _steps: |
2564 | _verification: |
2565 | Check the output. Was the modem listed? |
2566 | estimated_duration: 60s |
2567 | -flags: also-after-suspend-manual |
2568 | +flags: also-after-suspend |
2569 | imports: from com.canonical.plainbox import manifest |
2570 | category_id: wwan |
2571 | requires: |
2572 | @@ -128,7 +128,7 @@ _steps: |
2573 | _verification: |
2574 | Check the output. Was the SIM information printed? |
2575 | estimated_duration: 60s |
2576 | -flags: also-after-suspend-manual |
2577 | +flags: also-after-suspend |
2578 | imports: from com.canonical.plainbox import manifest |
2579 | category_id: wwan |
2580 | requires: |
2581 | @@ -160,7 +160,7 @@ _steps: |
2582 | _verification: |
2583 | Did the ping came back? |
2584 | estimated_duration: 120s |
2585 | -flags: also-after-suspend-manual |
2586 | +flags: also-after-suspend |
2587 | category_id: wwan |
2588 | imports: from com.canonical.plainbox import manifest |
2589 | requires: |
2590 | @@ -180,7 +180,7 @@ _steps: |
2591 | _verification: |
2592 | Were available networks listed? |
2593 | estimated_duration: 120s |
2594 | -flags: also-after-suspend-manual |
2595 | +flags: also-after-suspend |
2596 | category_id: wwan |
2597 | imports: from com.canonical.plainbox import manifest |
2598 | requires: |
2599 | @@ -220,7 +220,7 @@ _steps: |
2600 | _verification: |
2601 | Was the connection revived after plugging back in the antennae? |
2602 | estimate_duration: 120s |
2603 | -flags: also-after-suspend-manual |
2604 | +flags: also-after-suspend |
2605 | category_id: wwan |
2606 | imports: from com.canonical.plainbox import manifest |
2607 | requires: |
2608 | diff --git a/units/wwan/test-plan.pxu b/units/wwan/test-plan.pxu |
2609 | index 421b68f..e94157d 100644 |
2610 | --- a/units/wwan/test-plan.pxu |
2611 | +++ b/units/wwan/test-plan.pxu |
2612 | @@ -56,8 +56,8 @@ unit: test plan |
2613 | _name: Manual wwan tests (after suspend) |
2614 | _description: Manual wwan tests for Snappy Ubuntu Core devices |
2615 | include: |
2616 | - after-suspend-manual-wwan/detect-manual |
2617 | - after-suspend-manual-wwan/gsm-connection-manual |
2618 | - after-suspend-manual-wwan/check-sim-present-manual |
2619 | - after-suspend-manual-wwan/scan-networks-manual |
2620 | + after-suspend-wwan/detect-manual |
2621 | + after-suspend-wwan/gsm-connection-manual |
2622 | + after-suspend-wwan/check-sim-present-manual |
2623 | + after-suspend-wwan/scan-networks-manual |
2624 | after-suspend-wwan/gsm-connection-interrupted-manual |
(Ha, I +1-ed the old one :D)
Looks good! let's try landing it.