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