diff options
28 files changed, 290 insertions, 322 deletions
diff --git a/units/audio/jobs.pxu b/units/audio/jobs.pxu index e6b21a6..44cfe54 100644 --- a/units/audio/jobs.pxu +++ b/units/audio/jobs.pxu @@ -70,7 +70,7 @@ requires: package.name == 'alsa-base' package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' package.name == 'pulseaudio-utils' -flags: also-after-suspend-manual +flags: also-after-suspend command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings audio_settings.py set --verbose --device=hdmi --volume=50 @@ -99,7 +99,7 @@ requires: package.name == 'alsa-base' package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' package.name == 'pulseaudio-utils' -flags: also-after-suspend-manual +flags: also-after-suspend command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings audio_settings.py set --verbose --device=hdmi --volume=50 @@ -129,7 +129,7 @@ requires: package.name == 'alsa-base' package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' package.name == 'pulseaudio-utils' -flags: also-after-suspend-manual +flags: also-after-suspend command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings audio_settings.py set --verbose --device=hdmi --volume=50 @@ -159,7 +159,7 @@ requires: package.name == 'alsa-base' package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' package.name == 'pulseaudio-utils' -flags: also-after-suspend-manual +flags: also-after-suspend command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings audio_settings.py set --verbose --device=hdmi --volume=50 @@ -190,7 +190,7 @@ requires: package.name == 'alsa-base' package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' package.name == 'pulseaudio-utils' -flags: also-after-suspend-manual +flags: also-after-suspend command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings audio_settings.py set --verbose --device=hdmi --volume=50 @@ -221,7 +221,7 @@ requires: package.name == 'alsa-base' package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0' package.name == 'pulseaudio-utils' -flags: also-after-suspend-manual +flags: also-after-suspend command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings audio_settings.py set --verbose --device=hdmi --volume=50 diff --git a/units/bluetooth/jobs.pxu b/units/bluetooth/jobs.pxu index 7f3fb79..fbfef23 100644 --- a/units/bluetooth/jobs.pxu +++ b/units/bluetooth/jobs.pxu @@ -258,7 +258,7 @@ command: checkbox-support-eddystone_scanner -D {interface} plugin: shell user: root -flags: also-after-suspend also-after-suspend-manual +flags: also-after-suspend category_id: com.canonical.plainbox::bluetooth estimated_duration: 10 @@ -389,6 +389,6 @@ _steps: _verification: Confirm characters from Bluetooth input device are displayed correctly plugin: manual -flags: also-after-suspend-manual +flags: also-after-suspend category_id: com.canonical.plainbox::bluetooth estimated_duration: 5m diff --git a/units/bluetooth/test-plan.pxu b/units/bluetooth/test-plan.pxu index 9de4d37..9f1ec27 100644 --- a/units/bluetooth/test-plan.pxu +++ b/units/bluetooth/test-plan.pxu @@ -109,7 +109,7 @@ _name: Manual Bluetooth tests _description: Manual QA tests for Bluetooth estimated_duration: 5m include: - after-suspend-manual-bluetooth/keyboard-manual + after-suspend-bluetooth/keyboard-manual id: after-suspend-bluez-automated unit: test plan diff --git a/units/camera/jobs.pxu b/units/camera/jobs.pxu index 285fc2e..35bd879 100644 --- a/units/camera/jobs.pxu +++ b/units/camera/jobs.pxu @@ -28,7 +28,7 @@ template-unit: job plugin: user-interact-verify category_id: com.canonical.plainbox::camera id: camera/display_{name} -flags: also-after-suspend-manual +flags: also-after-suspend _summary: Webcam video display test for {product_slug} estimated_duration: 120.0 depends: camera/detect @@ -62,7 +62,7 @@ _description: 2. Camera LED should light for a few seconds VERIFICATION: Did the camera LED light? -flags: also-after-suspend-manual +flags: also-after-suspend unit: template template-resource: device @@ -72,7 +72,7 @@ plugin: user-interact-verify template-engine: jinja2 category_id: com.canonical.plainbox::camera id: camera/still_{{ name }} -flags: also-after-suspend-manual +flags: also-after-suspend _summary: Webcam still image capture test for {{ product_slug }} estimated_duration: 120.0 depends: camera/detect diff --git a/units/camera/test-plan.pxu b/units/camera/test-plan.pxu index d60b6dd..ee23896 100644 --- a/units/camera/test-plan.pxu +++ b/units/camera/test-plan.pxu @@ -24,8 +24,8 @@ unit: test plan _name: Camera tests (after suspend) _description: Camera tests (after suspend) include: - after-suspend-manual-camera/still_.* certification-status=blocker - after-suspend-manual-camera/display_.* certification-status=blocker + after-suspend-camera/still_.* certification-status=blocker + after-suspend-camera/display_.* certification-status=blocker bootstrap_include: device @@ -56,8 +56,8 @@ unit: test plan _name: Camera tests (after suspend, certification blockers only) _description: Camera tests (after suspend, certification blockers only) include: - after-suspend-manual-camera/still_.* certification-status=blocker - after-suspend-manual-camera/display_.* certification-status=blocker + after-suspend-camera/still_.* certification-status=blocker + after-suspend-camera/display_.* certification-status=blocker bootstrap_include: device diff --git a/units/dock/jobs.pxu b/units/dock/jobs.pxu index 87b1b84..ca291d7 100644 --- a/units/dock/jobs.pxu +++ b/units/dock/jobs.pxu @@ -242,7 +242,7 @@ requires: package.name == 'pulseaudio-utils' _summary: HDMI audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -270,7 +270,7 @@ requires: package.name == 'pulseaudio-utils' _summary: DisplayPort audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -325,7 +325,7 @@ requires: package.name == 'pulseaudio-utils' _summary: HDMI audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -355,7 +355,7 @@ requires: manifest.has_thunderbolt3 == 'True' _summary: DisplayPort audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -377,7 +377,7 @@ _verification: id: dock/audio-playback-headphones category_id: dock-audio plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 _summary: Headphones output test depends: dock/audio-list-devices @@ -407,7 +407,7 @@ plugin: user-interact-verify category_id: dock-audio id: dock/audio-alsa-record-playback-external estimated_duration: 30.0 -flags: also-after-suspend-manual +flags: also-after-suspend _summary: External microphone plugged to the dock to record sound test depends: dock/audio-playback-headphones requires: @@ -1114,7 +1114,7 @@ requires: package.name == 'pulseaudio-utils' _summary: HDMI audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -1142,7 +1142,7 @@ requires: package.name == 'pulseaudio-utils' _summary: HDMI audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -1170,7 +1170,7 @@ requires: package.name == 'pulseaudio-utils' _summary: DisplayPort audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -1198,7 +1198,7 @@ requires: package.name == 'pulseaudio-utils' _summary: HDMI audio test plugin: user-interact-verify -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 30.0 command: audio_settings.py store --verbose --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings @@ -1959,7 +1959,7 @@ estimated_duration: 40.0 depends: dock/cold-plug imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt3 == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend command: removable_storage_watcher.py insert --timeout 40 scsi _summary: Thunderbolt3 storage insertion detection _purpose: @@ -1981,7 +1981,7 @@ user: root depends: dock/thunderbolt3-insert imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt3 == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend command: removable_storage_test.py -s 268400000 scsi _summary: Thunderbolt3 storage test _description: @@ -1995,7 +1995,7 @@ estimated_duration: 20.0 depends: dock/thunderbolt3-insert imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt3 == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend command: removable_storage_watcher.py remove scsi _summary: Thunderbolt3 storage removal detection _purpose: @@ -2011,7 +2011,7 @@ _verification: plugin: user-interact-verify category_id: dock id: dock/thunderbolt3-daisy-chain -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 45.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt3 == 'True' diff --git a/units/dock/test-plan.pxu b/units/dock/test-plan.pxu index b453a6c..b9d3429 100644 --- a/units/dock/test-plan.pxu +++ b/units/dock/test-plan.pxu @@ -119,23 +119,23 @@ include: dock/usb-c/insert-after-suspend dock/usb-c/storage-automated-after-suspend dock/usb-c/remove-after-suspend - after-suspend-manual-dock/audio-playback-headphones certification-status=blocker - after-suspend-manual-dock/audio-alsa-record-playback-external certification-status=blocker + after-suspend-dock/audio-playback-headphones certification-status=blocker + after-suspend-dock/audio-alsa-record-playback-external certification-status=blocker dock/monitor-displayport-after-suspend certification-status=blocker - after-suspend-manual-dock/audio-playback-displayport certification-status=blocker + after-suspend-dock/audio-playback-displayport certification-status=blocker dock/monitor-dvi-after-suspend certification-status=blocker dock/monitor-hdmi-after-suspend certification-status=blocker - after-suspend-manual-dock/audio-playback-hdmi certification-status=blocker + after-suspend-dock/audio-playback-hdmi certification-status=blocker dock/monitor-vga-after-suspend certification-status=blocker dock/monitor_type-c_displayport-after-suspend - after-suspend-manual-dock/audio-playback-type-c-displayport + after-suspend-dock/audio-playback-type-c-displayport dock/monitor_type-c_hdmi-after-suspend dock/monitor_type-c_vga-after-suspend - after-suspend-manual-dock/thunderbolt3-insert - after-suspend-manual-dock/thunderbolt3-storage-test - after-suspend-manual-dock/thunderbolt3-remove - after-suspend-manual-dock/thunderbolt3-daisy-chain - after-suspend-manual-dock/audio-playback-thunderbolt3 + after-suspend-dock/thunderbolt3-insert + after-suspend-dock/thunderbolt3-storage-test + after-suspend-dock/thunderbolt3-remove + after-suspend-dock/thunderbolt3-daisy-chain + after-suspend-dock/audio-playback-thunderbolt3 dock/monitor-dual-head-after-suspend certification-status=blocker dock/monitor-triple-head-after-suspend @@ -155,10 +155,10 @@ include: dock/hotplug-usb3-remove-after-suspend dock/hotplug-monitor-displayport-after-suspend dock/hotplug-monitor-hdmi-after-suspend - after-suspend-manual-dock/hotplug-playback-displayport - after-suspend-manual-dock/hotplug-playback-hdmi - after-suspend-manual-dock/hotplug-playback-type-c-displayport - after-suspend-manual-dock/hotplug-playback-thumderbolt3 + after-suspend-dock/hotplug-playback-displayport + after-suspend-dock/hotplug-playback-hdmi + after-suspend-dock/hotplug-playback-type-c-displayport + after-suspend-dock/hotplug-playback-thumderbolt3 id: suspend-dock-resume-test unit: test plan @@ -238,8 +238,8 @@ include: suspend/suspend_advanced_auto certification-status=blocker dock/power-button-after-suspend certification-status=blocker dock/networking-gateway-ping-after-suspend certification-status=blocker - after-suspend-manual-dock/audio-playback-headphones certification-status=blocker - after-suspend-manual-dock/audio-alsa-record-playback-external certification-status=blocker + after-suspend-dock/audio-playback-headphones certification-status=blocker + after-suspend-dock/audio-alsa-record-playback-external certification-status=blocker dock/usb-HID-after-suspend certification-status=blocker dock/usb-insert-after-suspend certification-status=blocker dock/usb-storage-automated-after-suspend certification-status=blocker @@ -248,9 +248,9 @@ include: dock/usb3-storage-automated-after-suspend certification-status=blocker dock/usb3-remove-after-suspend certification-status=blocker dock/monitor-displayport-after-suspend certification-status=blocker - after-suspend-manual-dock/audio-playback-displayport certification-status=blocker + after-suspend-dock/audio-playback-displayport certification-status=blocker dock/monitor-dvi-after-suspend certification-status=blocker dock/monitor-hdmi-after-suspend certification-status=blocker - after-suspend-manual-dock/audio-playback-hdmi certification-status=blocker + after-suspend-dock/audio-playback-hdmi certification-status=blocker dock/monitor-vga-after-suspend certification-status=blocker dock/monitor-dual-head-after-suspend certification-status=blocker diff --git a/units/keys/jobs.pxu b/units/keys/jobs.pxu index 6c4fc99..767d88d 100644 --- a/units/keys/jobs.pxu +++ b/units/keys/jobs.pxu @@ -4,7 +4,7 @@ id: keys/lock-screen estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend command: lock_screen_watcher.py _description: PURPOSE: @@ -24,7 +24,7 @@ id: keys/brightness estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: This test will test the brightness key @@ -39,7 +39,7 @@ id: keys/volume estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: key_test.py -s '0xe02e,0xe0ae:Volume Down' '0xe030,0xe0b0:Volume Up' _description: @@ -58,7 +58,7 @@ id: keys/mute estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: key_test.py -s '0xe020,0xe0a0:Mute' _description: @@ -76,7 +76,7 @@ id: keys/sleep estimated_duration: 90.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: This test will test the sleep key @@ -92,7 +92,7 @@ id: keys/battery-info estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: key_test.py -s '0xe071,0xef1:Battery Info' _description: @@ -112,7 +112,7 @@ id: keys/wireless estimated_duration: 90.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: This test will test the wireless key @@ -134,7 +134,7 @@ id: keys/media-control estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: key_test.py -s 0xe010,0xe090:Previous 0xe024,0xe0a4:Stop 0xe019,0xe099:Next 0xe022,0xe0a2:Play _description: @@ -153,7 +153,7 @@ id: keys/super estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: key_test.py -s '0xe05b,0xe0db:Left Super Key' _description: @@ -171,7 +171,7 @@ id: keys/video-out estimated_duration: 120.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: Validate that the External Video hot key is working as expected @@ -187,7 +187,7 @@ id: keys/touchpad estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: Verify touchpad hotkey toggles touchpad functionality on and off @@ -204,7 +204,7 @@ id: keys/keyboard-backlight estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: Verify that the keyboard backlight toggle key works properly @@ -227,7 +227,7 @@ requires: package.name == 'alsa-base' package.name == 'pulseaudio-utils' package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good' -flags: also-after-suspend-manual +flags: also-after-suspend command: audio_settings.py store --file="$PLAINBOX_SESSION_SHARE"/pulseaudio_settings audio_settings.py set --device=pci --volume=50 @@ -281,7 +281,7 @@ plugin: manual category_id: com.canonical.plainbox::keys id: keys/power-button estimated_duration: 30.0 -flags: also-after-suspend-manual +flags: also-after-suspend _purpose: This test will test the power button _steps: @@ -320,7 +320,7 @@ id: keys/fn-lock estimated_duration: 30.0 imports: from com.canonical.plainbox import manifest requires: manifest.has_special_keys == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend _purpose: This test will test the Fn Lock key _steps: diff --git a/units/keys/test-plan.pxu b/units/keys/test-plan.pxu index ffc111c..dc82838 100644 --- a/units/keys/test-plan.pxu +++ b/units/keys/test-plan.pxu @@ -42,18 +42,18 @@ _name: Special keys tests (after suspend) _description: Special keys tests (after suspend) include: - after-suspend-manual-keys/lock-screen certification-status=blocker - after-suspend-manual-keys/super certification-status=blocker - after-suspend-manual-keys/brightness certification-status=blocker - after-suspend-manual-keys/media-control certification-status=blocker - after-suspend-manual-keys/mute certification-status=blocker - after-suspend-manual-keys/volume certification-status=blocker - after-suspend-manual-keys/video-out certification-status=blocker - after-suspend-manual-keys/wireless certification-status=blocker - after-suspend-manual-keys/keyboard-backlight certification-status=blocker - after-suspend-manual-keys/microphone-mute certification-status=blocker - after-suspend-manual-keys/power-button certification-status=blocker - after-suspend-manual-keys/fn-lock certification-status=non-blocker + after-suspend-keys/lock-screen certification-status=blocker + after-suspend-keys/super certification-status=blocker + after-suspend-keys/brightness certification-status=blocker + after-suspend-keys/media-control certification-status=blocker + after-suspend-keys/mute certification-status=blocker + after-suspend-keys/volume certification-status=blocker + after-suspend-keys/video-out certification-status=blocker + after-suspend-keys/wireless certification-status=blocker + after-suspend-keys/keyboard-backlight certification-status=blocker + after-suspend-keys/microphone-mute certification-status=blocker + after-suspend-keys/power-button certification-status=blocker + after-suspend-keys/fn-lock certification-status=non-blocker id: keys-cert-blockers unit: test plan @@ -81,14 +81,14 @@ _name: Special keys tests (certification blockers only, after suspend) _description: Special keys tests (certification blockers only, after suspend) include: - after-suspend-manual-keys/lock-screen certification-status=blocker - after-suspend-manual-keys/super certification-status=blocker - after-suspend-manual-keys/brightness certification-status=blocker - after-suspend-manual-keys/media-control certification-status=blocker - after-suspend-manual-keys/mute certification-status=blocker - after-suspend-manual-keys/volume certification-status=blocker - after-suspend-manual-keys/video-out certification-status=blocker - after-suspend-manual-keys/wireless certification-status=blocker - after-suspend-manual-keys/keyboard-backlight certification-status=blocker - after-suspend-manual-keys/microphone-mute certification-status=blocker - after-suspend-manual-keys/power-button certification-status=blocker + after-suspend-keys/lock-screen certification-status=blocker + after-suspend-keys/super certification-status=blocker + after-suspend-keys/brightness certification-status=blocker + after-suspend-keys/media-control certification-status=blocker + after-suspend-keys/mute certification-status=blocker + after-suspend-keys/volume certification-status=blocker + after-suspend-keys/video-out certification-status=blocker + after-suspend-keys/wireless certification-status=blocker + after-suspend-keys/keyboard-backlight certification-status=blocker + after-suspend-keys/microphone-mute certification-status=blocker + after-suspend-keys/power-button certification-status=blocker diff --git a/units/led/jobs.pxu b/units/led/jobs.pxu index b1be9d0..89f8415 100644 --- a/units/led/jobs.pxu +++ b/units/led/jobs.pxu @@ -218,7 +218,6 @@ _description: VERIFICATION: Did the Audio LED turn on and off or change color as expected? flags: also-after-suspend - also-after-suspend-manual plugin: manual category_id: led @@ -235,7 +234,6 @@ _description: VERIFICATION: Did the Microphone Mute LED turn on and off or change color as expected? flags: also-after-suspend - also-after-suspend-manual id: led/serial _summary: Serial ports LED behavior @@ -255,7 +253,7 @@ plugin: manual category_id: led id: led/fn estimated_duration: 30.0 -flags: also-after-suspend-manual +flags: also-after-suspend _purpose: This test will test Fn key LED _steps: diff --git a/units/led/test-plan.pxu b/units/led/test-plan.pxu index b0d0129..c3e9ed9 100644 --- a/units/led/test-plan.pxu +++ b/units/led/test-plan.pxu @@ -52,16 +52,16 @@ unit: test plan _name: LED tests (after suspend) _description: LED tests (after suspend) include: - after-suspend-manual-camera/led_.* certification-status=blocker + after-suspend-camera/led_.* certification-status=blocker suspend/led_after_suspend/caps-lock certification-status=blocker suspend/led_after_suspend/numeric-keypad certification-status=blocker suspend/led_after_suspend/power certification-status=blocker - after-suspend-manual-led/mute certification-status=blocker - after-suspend-manual-led/microphone-mute certification-status=blocker + after-suspend-led/mute certification-status=blocker + after-suspend-led/microphone-mute certification-status=blocker suspend/led_after_suspend/bluetooth certification-status=non-blocker suspend/led_after_suspend/wlan certification-status=non-blocker suspend/led_after_suspend/wlan-disabled certification-status=non-blocker - after-suspend-manual-led/fn certification-status=non-blocker + after-suspend-led/fn certification-status=non-blocker bootstrap_include: device @@ -86,12 +86,12 @@ unit: test plan _name: LED tests (after suspend, certification blockers only) _description: LED tests (after suspend, certification blockers only) include: - after-suspend-manual-camera/led_.* certification-status=blocker + after-suspend-camera/led_.* certification-status=blocker suspend/led_after_suspend/caps-lock certification-status=blocker suspend/led_after_suspend/numeric-keypad certification-status=blocker suspend/led_after_suspend/power certification-status=blocker - after-suspend-manual-led/mute certification-status=blocker - after-suspend-manual-led/microphone-mute certification-status=blocker + after-suspend-led/mute certification-status=blocker + after-suspend-led/microphone-mute certification-status=blocker bootstrap_include: device diff --git a/units/monitor/jobs.pxu b/units/monitor/jobs.pxu index 2ba9e99..46ecb20 100644 --- a/units/monitor/jobs.pxu +++ b/units/monitor/jobs.pxu @@ -3,7 +3,7 @@ template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' id: monitor/{index}_vga_{product_slug} requires: display.vga == 'supported' or display.dp == 'supported' -flags: also-after-suspend-manual +flags: also-after-suspend plugin: manual category_id: com.canonical.plainbox::monitor _purpose: @@ -22,7 +22,7 @@ template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' id: monitor/{index}_dvi_{product_slug} requires: display.dvi == 'supported' -flags: also-after-suspend-manual +flags: also-after-suspend plugin: manual category_id: com.canonical.plainbox::monitor _purpose: @@ -41,7 +41,7 @@ template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' id: monitor/{index}_displayport_{product_slug} requires: display.dp == 'supported' -flags: also-after-suspend-manual +flags: also-after-suspend plugin: manual category_id: com.canonical.plainbox::monitor _purpose: @@ -60,7 +60,7 @@ template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' id: monitor/{index}_hdmi_{product_slug} requires: display.hdmi == 'supported' -flags: also-after-suspend-manual +flags: also-after-suspend plugin: manual category_id: com.canonical.plainbox::monitor _purpose: @@ -115,7 +115,7 @@ template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' id: monitor/{index}_multi-head_{product_slug} requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower', 'Space-saving'] -flags: also-after-suspend-manual +flags: also-after-suspend plugin: manual category_id: com.canonical.plainbox::monitor _purpose: @@ -132,7 +132,7 @@ _verification: unit: template template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' -flags: also-after-suspend-manual +flags: also-after-suspend id: monitor/{index}_powersaving_{product_slug} plugin: user-interact-verify category_id: com.canonical.plainbox::monitor @@ -153,7 +153,7 @@ requires: dmi.product in ['Notebook','Laptop','Portable','All In One','All-In-On plugin: user-interact-verify category_id: com.canonical.plainbox::monitor user: root -flags: also-after-suspend-manual +flags: also-after-suspend command: brightness_test.py _purpose: This test will test changes to screen brightness @@ -171,7 +171,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off' id: monitor/{index}_thunderbolt_{product_slug} imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 15.0 plugin: manual category_id: com.canonical.plainbox::monitor @@ -193,7 +193,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off' id: monitor/{index}_thunderbolt3_{product_slug} imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt3 == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 15.0 plugin: manual category_id: com.canonical.plainbox::monitor @@ -215,7 +215,7 @@ id: monitor/{index}_type-c_displayport_{product_slug} template-filter: graphics_card.prime_gpu_offload == 'Off' imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 15.0 plugin: manual category_id: com.canonical.plainbox::monitor @@ -237,7 +237,7 @@ id: monitor/{index}_type-c_hdmi_{product_slug} template-filter: graphics_card.prime_gpu_offload == 'Off' imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 15.0 plugin: manual category_id: com.canonical.plainbox::monitor @@ -259,7 +259,7 @@ id: monitor/{index}_type-c_vga_{product_slug} template-filter: graphics_card.prime_gpu_offload == 'Off' imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 15.0 plugin: manual category_id: com.canonical.plainbox::monitor @@ -278,7 +278,7 @@ _verification: id: monitor/type-c-to-hdmi imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 15.0 plugin: manual category_id: com.canonical.plainbox::monitor @@ -297,7 +297,7 @@ _verification: id: monitor/type-c-to-vga imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 15.0 plugin: manual category_id: com.canonical.plainbox::monitor diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu index 21b16cb..7c7b73a 100644 --- a/units/monitor/test-plan.pxu +++ b/units/monitor/test-plan.pxu @@ -16,7 +16,7 @@ _name: Monitor tests (after suspend, integrated GPU) _description: Monitor tests (after suspend, integrated GPU) include: nested_part: - after-suspend-manual-monitor-integrated-gpu-cert-manual + after-suspend-monitor-integrated-gpu-cert-manual id: monitor-integrated-gpu-cert-manual unit: test plan @@ -45,30 +45,30 @@ include: bootstrap_include: graphics_card -id: after-suspend-manual-monitor-integrated-gpu-cert-manual +id: after-suspend-monitor-integrated-gpu-cert-manual unit: test plan -_name: Monitor tests (after manual suspend, integrated GPU) (Manual) +_name: Monitor tests (after suspend, integrated GPU) (Manual) _description: - Monitor tests (after manual suspend, integrated GPU) (Manual) + Monitor tests (after suspend, integrated GPU) (Manual) include: - after-suspend-manual-monitor/1_powersaving_.* certification-status=blocker - after-suspend-manual-power-management/light_sensor - after-suspend-manual-monitor/1_dim_brightness_.* certification-status=blocker - after-suspend-manual-monitor/1_displayport_.* certification-status=blocker - after-suspend-manual-audio/1_playback_displayport_.* certification-status=blocker - after-suspend-manual-monitor/1_type-c_displayport_.* certification-status=blocker - after-suspend-manual-audio/1_playback_type-c_displayport_.* certification-status=blocker - after-suspend-manual-monitor/1_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-audio/1_playback_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/1_type-c_vga_.* certification-status=blocker - after-suspend-manual-monitor/1_dvi_.* certification-status=blocker - after-suspend-manual-monitor/1_hdmi_.* certification-status=blocker - after-suspend-manual-audio/1_playback_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/1_thunderbolt3_.* certification-status=non-blocker - after-suspend-manual-audio/1_playback_thunderbolt3_.* certification-status=non-blocker - after-suspend-manual-thunderbolt3/daisy-chain certification-status=non-blocker - after-suspend-manual-monitor/1_vga_.* certification-status=blocker - after-suspend-manual-monitor/1_multi-head_.* certification-status=blocker + after-suspend-monitor/1_powersaving_.* certification-status=blocker + after-suspend-power-management/light_sensor + after-suspend-monitor/1_dim_brightness_.* certification-status=blocker + after-suspend-monitor/1_displayport_.* certification-status=blocker + after-suspend-audio/1_playback_displayport_.* certification-status=blocker + after-suspend-monitor/1_type-c_displayport_.* certification-status=blocker + after-suspend-audio/1_playback_type-c_displayport_.* certification-status=blocker + after-suspend-monitor/1_type-c_hdmi_.* certification-status=blocker + after-suspend-audio/1_playback_type-c_hdmi_.* certification-status=blocker + after-suspend-monitor/1_type-c_vga_.* certification-status=blocker + after-suspend-monitor/1_dvi_.* certification-status=blocker + after-suspend-monitor/1_hdmi_.* certification-status=blocker + after-suspend-audio/1_playback_hdmi_.* certification-status=blocker + after-suspend-monitor/1_thunderbolt3_.* certification-status=non-blocker + after-suspend-audio/1_playback_thunderbolt3_.* certification-status=non-blocker + after-suspend-thunderbolt3/daisy-chain certification-status=non-blocker + after-suspend-monitor/1_vga_.* certification-status=blocker + after-suspend-monitor/1_multi-head_.* certification-status=blocker bootstrap_include: graphics_card @@ -127,33 +127,33 @@ _name: Monitor tests (after suspend, integrated GPU) _description: Monitor tests (after suspend, integrated GPU) include: nested_part: - after-suspend-manual-monitor-discrete-gpu-cert-manual + after-suspend-monitor-discrete-gpu-cert-manual -id: after-suspend-manual-monitor-discrete-gpu-cert-manual +id: after-suspend-monitor-discrete-gpu-cert-manual unit: test plan -_name: Monitor tests (after manual suspend, discrete GPU) (Manual) +_name: Monitor tests (after suspend, discrete GPU) (Manual) _description: - Monitor tests (after manual suspend, discrete GPU) (Manual) + Monitor tests (after suspend, discrete GPU) (Manual) include: - after-suspend-manual-monitor/2_powersaving_.* certification-status=blocker - after-suspend-manual-power-management/light_sensor - after-suspend-manual-monitor/2_dim_brightness_.* certification-status=blocker - after-suspend-manual-monitor/2_displayport_.* certification-status=blocker - after-suspend-manual-audio/2_playback_displayport_.* certification-status=blocker - after-suspend-manual-monitor/2_type-c_displayport_.* certification-status=blocker - after-suspend-manual-audio/2_playback_type-c_displayport_.* certification-status=blocker - after-suspend-manual-monitor/2_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-audio/2_playback_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/2_type-c_vga_.* certification-status=blocker - after-suspend-manual-monitor/2_dvi_.* certification-status=blocker - after-suspend-manual-monitor/2_hdmi_.* certification-status=blocker - after-suspend-manual-audio/2_playback_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/2_thunderbolt3_.* certification-status=non-blocker - after-suspend-manual-audio/2_playback_thunderbolt3_.* certification-status=non-blocker - after-suspend-manual-thunderbolt3/daisy-chain certification-status=non-blocker - after-suspend-manual-monitor/2_vga_.* certification-status=blocker - after-suspend-manual-monitor/2_multi-head_.* certification-status=blocker + after-suspend-monitor/2_powersaving_.* certification-status=blocker + after-suspend-power-management/light_sensor + after-suspend-monitor/2_dim_brightness_.* certification-status=blocker + after-suspend-monitor/2_displayport_.* certification-status=blocker + after-suspend-audio/2_playback_displayport_.* certification-status=blocker + after-suspend-monitor/2_type-c_displayport_.* certification-status=blocker + after-suspend-audio/2_playback_type-c_displayport_.* certification-status=blocker + after-suspend-monitor/2_type-c_hdmi_.* certification-status=blocker + after-suspend-audio/2_playback_type-c_hdmi_.* certification-status=blocker + after-suspend-monitor/2_type-c_vga_.* certification-status=blocker + after-suspend-monitor/2_dvi_.* certification-status=blocker + after-suspend-monitor/2_hdmi_.* certification-status=blocker + after-suspend-audio/2_playback_hdmi_.* certification-status=blocker + after-suspend-monitor/2_thunderbolt3_.* certification-status=non-blocker + after-suspend-audio/2_playback_thunderbolt3_.* certification-status=non-blocker + after-suspend-thunderbolt3/daisy-chain certification-status=non-blocker + after-suspend-monitor/2_vga_.* certification-status=blocker + after-suspend-monitor/2_multi-head_.* certification-status=blocker bootstrap_include: graphics_card @@ -189,25 +189,25 @@ include: bootstrap_include: graphics_card -id: after-suspend-manual-monitor-integrated-gpu-cert-blockers +id: after-suspend-monitor-integrated-gpu-cert-blockers unit: test plan -_name: Monitor tests (after manual suspend, integrated GPU, certification blockers only) -_description: Monitor tests (after manual suspend, integrated GPU, certification blockers only) +_name: Monitor tests (after suspend, integrated GPU, certification blockers only) +_description: Monitor tests (after suspend, integrated GPU, certification blockers only) include: - after-suspend-manual-monitor/1_powersaving_.* certification-status=blocker - after-suspend-manual-monitor/1_dim_brightness_.* certification-status=blocker - after-suspend-manual-monitor/1_displayport_.* certification-status=blocker - after-suspend-manual-audio/1_playback_displayport_.* certification-status=blocker - after-suspend-manual-monitor/1_type-c_displayport_.* certification-status=blocker - after-suspend-manual-audio/1_playback_type-c_displayport_.* certification-status=blocker - after-suspend-manual-monitor/1_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-audio/1_playback_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/1_type-c_vga_.* certification-status=blocker - after-suspend-manual-monitor/1_dvi_.* certification-status=blocker - after-suspend-manual-monitor/1_hdmi_.* certification-status=blocker - after-suspend-manual-audio/1_playback_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/1_vga_.* certification-status=blocker - after-suspend-manual-monitor/1_multi-head_.* certification-status=blocker + after-suspend-monitor/1_powersaving_.* certification-status=blocker + after-suspend-monitor/1_dim_brightness_.* certification-status=blocker + after-suspend-monitor/1_displayport_.* certification-status=blocker + after-suspend-audio/1_playback_displayport_.* certification-status=blocker + after-suspend-monitor/1_type-c_displayport_.* certification-status=blocker + after-suspend-audio/1_playback_type-c_displayport_.* certification-status=blocker + after-suspend-monitor/1_type-c_hdmi_.* certification-status=blocker + after-suspend-audio/1_playback_type-c_hdmi_.* certification-status=blocker + after-suspend-monitor/1_type-c_vga_.* certification-status=blocker + after-suspend-monitor/1_dvi_.* certification-status=blocker + after-suspend-monitor/1_hdmi_.* certification-status=blocker + after-suspend-audio/1_playback_hdmi_.* certification-status=blocker + after-suspend-monitor/1_vga_.* certification-status=blocker + after-suspend-monitor/1_multi-head_.* certification-status=blocker bootstrap_include: graphics_card @@ -233,25 +233,25 @@ include: bootstrap_include: graphics_card -id: after-suspend-manual-monitor-discrete-gpu-cert-blockers +id: after-suspend-monitor-discrete-gpu-cert-blockers unit: test plan -_name: Monitor tests (after manual suspend, discrete GPU, certification blockers only) -_description: Monitor tests (after manual suspend, discrete GPU, certification blockers only) +_name: Monitor tests (after suspend, discrete GPU, certification blockers only) +_description: Monitor tests (after suspend, discrete GPU, certification blockers only) include: - after-suspend-manual-monitor/2_powersaving_.* certification-status=blocker - after-suspend-manual-monitor/2_dim_brightness_.* certification-status=blocker - after-suspend-manual-monitor/2_displayport_.* certification-status=blocker - after-suspend-manual-audio/2_playback_displayport_.* certification-status=blocker - after-suspend-manual-monitor/2_type-c_displayport_.* certification-status=blocker - after-suspend-manual-audio/2_playback_type-c_displayport_.* certification-status=blocker - after-suspend-manual-monitor/2_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-audio/2_playback_type-c_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/2_type-c_vga_.* certification-status=blocker - after-suspend-manual-monitor/2_dvi_.* certification-status=blocker - after-suspend-manual-monitor/2_hdmi_.* certification-status=blocker - after-suspend-manual-audio/2_playback_hdmi_.* certification-status=blocker - after-suspend-manual-monitor/2_vga_.* certification-status=blocker - after-suspend-manual-monitor/2_multi-head_.* certification-status=blocker + after-suspend-monitor/2_powersaving_.* certification-status=blocker + after-suspend-monitor/2_dim_brightness_.* certification-status=blocker + after-suspend-monitor/2_displayport_.* certification-status=blocker + after-suspend-audio/2_playback_displayport_.* certification-status=blocker + after-suspend-monitor/2_type-c_displayport_.* certification-status=blocker + after-suspend-audio/2_playback_type-c_displayport_.* certification-status=blocker + after-suspend-monitor/2_type-c_hdmi_.* certification-status=blocker + after-suspend-audio/2_playback_type-c_hdmi_.* certification-status=blocker + after-suspend-monitor/2_type-c_vga_.* certification-status=blocker + after-suspend-monitor/2_dvi_.* certification-status=blocker + after-suspend-monitor/2_hdmi_.* certification-status=blocker + after-suspend-audio/2_playback_hdmi_.* certification-status=blocker + after-suspend-monitor/2_vga_.* certification-status=blocker + after-suspend-monitor/2_multi-head_.* certification-status=blocker bootstrap_include: graphics_card diff --git a/units/optical/jobs.pxu b/units/optical/jobs.pxu index bcb93c3..e38a998 100644 --- a/units/optical/jobs.pxu +++ b/units/optical/jobs.pxu @@ -16,7 +16,7 @@ id: optical/read_{name} estimated_duration: 120.0 user: root command: optical_read_test.py /dev/{name} -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: This test will check your {product} device's ability to read CD media @@ -165,7 +165,7 @@ requires: optical_drive_{name}.bd_read == "supported" user: root command: optical_read_test.py /dev/{name} -flags: also-after-suspend-manual +flags: also-after-suspend _description: PURPOSE: This test will check your {product} device's ability to read Blu-Ray (BD) media diff --git a/units/optical/test-plan.pxu b/units/optical/test-plan.pxu index f927f00..a9e054a 100644 --- a/units/optical/test-plan.pxu +++ b/units/optical/test-plan.pxu @@ -38,8 +38,8 @@ _description: Optical drive tests (after suspend) include: optical/detect certification-status=blocker - after-suspend-manual-optical/read_.* certification-status=blocker - after-suspend-manual-optical/bluray-read_.* certification-status=blocker + after-suspend-optical/read_.* certification-status=blocker + after-suspend-optical/bluray-read_.* certification-status=blocker bootstrap_include: device @@ -60,8 +60,8 @@ _name: Optical drive tests (certification blockers only) _description: Optical drive tests (certification blockers only) include: optical/detect certification-status=blocker - after-suspend-manual-optical/read_.* certification-status=blocker - after-suspend-manual-optical/bluray-read_.* certification-status=blocker + after-suspend-optical/read_.* certification-status=blocker + after-suspend-optical/bluray-read_.* certification-status=blocker bootstrap_include: device diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu index d449564..8a1a385 100644 --- a/units/power-management/jobs.pxu +++ b/units/power-management/jobs.pxu @@ -458,7 +458,7 @@ estimated_duration: 10.0 requires: dmi.product in ['Notebook','Laptop','Portable'] executable.name == 'monitor-sensor' -flags: also-after-suspend-manual +flags: also-after-suspend command: light_sensor_test.sh _description: _purpose: diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu index 595e7d4..fbe30ca 100644 --- a/units/stress/jobs.pxu +++ b/units/stress/jobs.pxu @@ -598,4 +598,4 @@ command: done environ: WPA_N_SSID WPA_N_PSK category_id: com.canonical.plainbox::stress -flags: preserve-locale also-after-suspend-manual +flags: preserve-locale also-after-suspend diff --git a/units/thunderbolt/jobs.pxu b/units/thunderbolt/jobs.pxu index 4b59ee8..a2bbf75 100644 --- a/units/thunderbolt/jobs.pxu +++ b/units/thunderbolt/jobs.pxu @@ -6,7 +6,7 @@ requires: manifest.has_thunderbolt == 'True' estimated_duration: 20.0 command: removable_storage_watcher.py insert --timeout 40 scsi _siblings: [ - { "id": "after-suspend-manual-thunderbolt/insert", + { "id": "after-suspend-thunderbolt/insert", "_summary": "thunderbolt/insert after suspend", "depends": "suspend/suspend_advanced_auto"} ] @@ -33,9 +33,9 @@ depends: thunderbolt/insert estimated_duration: 45.0 command: removable_storage_test.py -s 268400000 scsi _siblings: [ - { "id": "after-suspend-manual-thunderbolt/storage-test", + { "id": "after-suspend-thunderbolt/storage-test", "_summary": "thunderbolt/storage-test after suspend", - "depends": "after-suspend-manual-thunderbolt/insert"} + "depends": "after-suspend-thunderbolt/insert"} ] _summary: Storage test on Thunderbolt _description: @@ -52,9 +52,9 @@ estimated_duration: 10.0 command: removable_storage_watcher.py remove scsi _summary: Storage removal detection on Thunderbolt _siblings: [ - { "id": "after-suspend-manual-thunderbolt/remove", + { "id": "after-suspend-thunderbolt/remove", "_summary": "thunderbolt/remove after suspend", - "depends": "after-suspend-manual-thunderbolt/insert"} + "depends": "after-suspend-thunderbolt/insert"} ] _description: PURPOSE: @@ -72,7 +72,7 @@ category_id: com.canonical.plainbox::disk id: thunderbolt/daisy-chain imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 45.0 command: removable_storage_test.py -s 268400000 scsi _summary: Daisy-chain testing for Thunderbolt storage and display device @@ -98,7 +98,7 @@ requires: manifest.has_thunderbolt3 == 'True' estimated_duration: 20.0 command: removable_storage_watcher.py insert --timeout 40 scsi _siblings: [ - { "id": "after-suspend-manual-thunderbolt3/insert", + { "id": "after-suspend-thunderbolt3/insert", "_summary": "thunderbolt3/insert after suspend", "depends": "suspend/suspend_advanced_auto"} ] @@ -125,9 +125,9 @@ depends: thunderbolt3/insert estimated_duration: 45.0 command: removable_storage_test.py -s 268400000 scsi _siblings: [ - { "id": "after-suspend-manual-thunderbolt3/storage-test", + { "id": "after-suspend-thunderbolt3/storage-test", "_summary": "thunderbolt3/storage-test after suspend", - "depends": "after-suspend-manual-thunderbolt3/insert"} + "depends": "after-suspend-thunderbolt3/insert"} ] _summary: Storage test on Thunderbolt 3 _description: @@ -157,9 +157,9 @@ depends: thunderbolt3/insert estimated_duration: 10.0 command: removable_storage_watcher.py remove scsi _siblings: [ - { "id": "after-suspend-manual-thunderbolt3/remove", + { "id": "after-suspend-thunderbolt3/remove", "_summary": "thunderbolt3/remove after suspend", - "depends": "after-suspend-manual-thunderbolt3/insert"} + "depends": "after-suspend-thunderbolt3/insert"} ] _summary: Storage removal detection on Thunderbolt 3 port _description: @@ -179,7 +179,7 @@ id: thunderbolt3/daisy-chain user: root imports: from com.canonical.plainbox import manifest requires: manifest.has_thunderbolt3 == 'True' -flags: also-after-suspend-manual +flags: also-after-suspend estimated_duration: 45.0 command: removable_storage_test.py -s 268400000 scsi _summary: Daisy-chain testing for Thunderbolt 3 storage and display device diff --git a/units/thunderbolt/test-plan.pxu b/units/thunderbolt/test-plan.pxu index 209e9c7..d876201 100644 --- a/units/thunderbolt/test-plan.pxu +++ b/units/thunderbolt/test-plan.pxu @@ -50,15 +50,15 @@ _name: Thunderbolt tests (after suspend Manual) _description: Thunderbolt tests (after suspend Manual) include: - after-suspend-manual-thunderbolt3/insert certification-status=blocker - after-suspend-manual-thunderbolt3/storage-test certification-status=blocker - after-suspend-manual-thunderbolt3/remove certification-status=blocker + after-suspend-thunderbolt3/insert certification-status=blocker + after-suspend-thunderbolt3/storage-test certification-status=blocker + after-suspend-thunderbolt3/remove certification-status=blocker id: after-suspend-thunderbolt-cert-blockers unit: test plan _name: Thunderbolt tests (after suspend - certification blockers only) _description: Thunderbolt tests (after suspend - certification blockers only) include: - after-suspend-manual-thunderbolt3/insert certification-status=blocker - after-suspend-manual-thunderbolt3/storage-test certification-status=blocker - after-suspend-manual-thunderbolt3/remove certification-status=blocker \ No newline at end of file + after-suspend-thunderbolt3/insert certification-status=blocker + after-suspend-thunderbolt3/storage-test certification-status=blocker + after-suspend-thunderbolt3/remove certification-status=blocker diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu index 060e0c6..8618e2c 100644 --- a/units/touchscreen/jobs.pxu +++ b/units/touchscreen/jobs.pxu @@ -62,7 +62,7 @@ _description: 5. Drag and drop the Screenshot* files to Home folder VERIFICATION: Does drag and drop work? -flags: also-after-suspend-manual +flags: also-after-suspend plugin: user-interact-verify category_id: com.canonical.plainbox::touchscreen @@ -80,7 +80,7 @@ _description: 2. Using 2 fingers, resize the blue square until it turns green, then release it. VERIFICATION: Did the blue square change size following the gesture? -flags: also-after-suspend-manual +flags: also-after-suspend plugin: user-interact-verify category_id: com.canonical.plainbox::touchscreen @@ -98,7 +98,7 @@ _description: 2. Using 2 fingers, rotate the blue square until it turns green, then release it. VERIFICATION: Did the blue square rotate following the gesture? -flags: also-after-suspend-manual +flags: also-after-suspend plugin: manual category_id: com.canonical.plainbox::touchscreen @@ -164,7 +164,7 @@ command: EXIT=$? {% endif %} exit $EXIT -flags: also-after-suspend-manual +flags: also-after-suspend plugin: user-interact-verify template-engine: jinja2 @@ -199,7 +199,7 @@ command: EXIT=$? {% endif %} exit $EXIT -flags: also-after-suspend-manual +flags: also-after-suspend unit: template template-resource: device diff --git a/units/touchscreen/test-plan.pxu b/units/touchscreen/test-plan.pxu index f53e3dd..44db4be 100644 --- a/units/touchscreen/test-plan.pxu +++ b/units/touchscreen/test-plan.pxu @@ -43,11 +43,11 @@ _name: Touchscreen tests (Manual) _description: Touchscreen tests (Manual) include: - after-suspend-manual-touchscreen/drag-n-drop certification-status=blocker - after-suspend-manual-touchscreen/multitouch-zoom certification-status=blocker - after-suspend-manual-touchscreen/multitouch-rotate - after-suspend-manual-touchscreen/3-touch-tap certification-status=blocker - after-suspend-manual-touchscreen/4-touch-tap certification-status=blocker + after-suspend-touchscreen/drag-n-drop certification-status=blocker + after-suspend-touchscreen/multitouch-zoom certification-status=blocker + after-suspend-touchscreen/multitouch-rotate + after-suspend-touchscreen/3-touch-tap certification-status=blocker + after-suspend-touchscreen/4-touch-tap certification-status=blocker id: after-suspend-touchscreen-cert-automated unit: test plan @@ -71,10 +71,10 @@ unit: test plan _name: Touchscreen tests (after suspend, certification blockers only) _description: Touchscreen tests (after suspend, certification blockers only) include: - after-suspend-manual-touchscreen/drag-n-drop certification-status=blocker - after-suspend-manual-touchscreen/multitouch-zoom certification-status=blocker - after-suspend-manual-touchscreen/3-touch-tap certification-status=blocker - after-suspend-manual-touchscreen/4-touch-tap certification-status=blocker + after-suspend-touchscreen/drag-n-drop certification-status=blocker + after-suspend-touchscreen/multitouch-zoom certification-status=blocker + after-suspend-touchscreen/3-touch-tap certification-status=blocker + after-suspend-touchscreen/4-touch-tap certification-status=blocker id: touchscreen-evdev unit: test plan diff --git a/units/usb/test-plan.pxu b/units/usb/test-plan.pxu index 690204e..5d7f05f 100644 --- a/units/usb/test-plan.pxu +++ b/units/usb/test-plan.pxu @@ -94,15 +94,15 @@ unit: test plan _name: USB Type-C tests (after suspend) _description: USB Type-C tests (after suspend) include: - after-suspend-manual-usb-c/c-to-a-adapter/hid certification-status=blocker - after-suspend-manual-usb-c/c-to-a-adapter/insert certification-status=blocker - after-suspend-manual-usb-c/c-to-a-adapter/storage-automated certification-status=blocker - after-suspend-manual-usb-c/c-to-a-adapter/remove certification-status=blocker - after-suspend-manual-usb-c/hid certification-status=blocker - after-suspend-manual-usb-c/insert certification-status=blocker - after-suspend-manual-usb-c/storage-automated certification-status=blocker - after-suspend-manual-usb-c/remove certification-status=blocker - after-suspend-manual-usb-c/c-to-ethernet-adapter-insert + after-suspend-usb-c/c-to-a-adapter/hid certification-status=blocker + after-suspend-usb-c/c-to-a-adapter/insert certification-status=blocker + after-suspend-usb-c/c-to-a-adapter/storage-automated certification-status=blocker + after-suspend-usb-c/c-to-a-adapter/remove certification-status=blocker + after-suspend-usb-c/hid certification-status=blocker + after-suspend-usb-c/insert certification-status=blocker + after-suspend-usb-c/storage-automated certification-status=blocker + after-suspend-usb-c/remove certification-status=blocker + after-suspend-usb-c/c-to-ethernet-adapter-insert id: usb-cert-blockers unit: test plan @@ -161,14 +161,14 @@ unit: test plan _name: USB Type-C tests (after suspend, certification blockers only) _description: USB Type-C tests (after suspend, certification blockers only) include: - after-suspend-manual-usb-c/c-to-a-adapter/hid certification-status=blocker - after-suspend-manual-usb-c/c-to-a-adapter/insert certification-status=blocker - after-suspend-manual-usb-c/c-to-a-adapter/storage-automated certification-status=blocker - after-suspend-manual-usb-c/c-to-a-adapter/remove certification-status=blocker - after-suspend-manual-usb-c/hid certification-status=blocker - after-suspend-manual-usb-c/insert certification-status=blocker - after-suspend-manual-usb-c/storage-automated certification-status=blocker - after-suspend-manual-usb-c/remove certification-status=blocker + after-suspend-usb-c/c-to-a-adapter/hid certification-status=blocker + after-suspend-usb-c/c-to-a-adapter/insert certification-status=blocker + after-suspend-usb-c/c-to-a-adapter/storage-automated certification-status=blocker + after-suspend-usb-c/c-to-a-adapter/remove certification-status=blocker + after-suspend-usb-c/hid certification-status=blocker + after-suspend-usb-c/insert certification-status=blocker + after-suspend-usb-c/storage-automated certification-status=blocker + after-suspend-usb-c/remove certification-status=blocker id: usb-preinserted unit: test plan diff --git a/units/usb/usb-c.pxu b/units/usb/usb-c.pxu index 9ec912a..31f21ad 100644 --- a/units/usb/usb-c.pxu +++ b/units/usb/usb-c.pxu @@ -10,7 +10,7 @@ _steps: _verification: Did the device work as expected? plugin: manual -flags: also-after-suspend-manual +flags: also-after-suspend category_id: com.canonical.plainbox::usb imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' @@ -32,7 +32,7 @@ _verification: The verification of this test is automated. Do not change the automatically selected result. plugin: user-interact -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: if [[ -v SNAP ]]; then @@ -52,7 +52,7 @@ _description: This test is automated and executes after the usb-c/c-to-a-adapter/insert test is run. plugin: shell -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: if [[ -v SNAP ]]; then @@ -80,7 +80,7 @@ _verification: The verification of this test is automated. Do not change the automatically selected result. plugin: user-interact -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: if [[ -v SNAP ]]; then @@ -107,7 +107,7 @@ _steps: _verification: Did the device work as expected? plugin: manual -flags: also-after-suspend-manual +flags: also-after-suspend category_id: com.canonical.plainbox::usb imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' @@ -128,7 +128,7 @@ _verification: The verification of this test is automated. Do not change the automatically selected result. plugin: user-interact -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: if [[ -v SNAP ]]; then @@ -149,7 +149,7 @@ _description: This test is automated and executes after the usb-c/insert test is run. plugin: shell -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: if [[ -v SNAP ]]; then @@ -176,7 +176,7 @@ _verification: The verification of this test is automated. Do not change the automatically selected result. plugin: user-interact -flags: also-after-suspend-manual +flags: also-after-suspend user: root command: if [[ -v SNAP ]]; then @@ -193,7 +193,7 @@ estimated_duration: 30 id: usb-c/c-to-ethernet-adapter-insert plugin: user-interact -flags: also-after-suspend-manual +flags: also-after-suspend category_id: com.canonical.plainbox::usb imports: from com.canonical.plainbox import manifest requires: manifest.has_usb_type_c == 'True' diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu index 95ddf31..05349b8 100644 --- a/units/wireless/jobs.pxu +++ b/units/wireless/jobs.pxu @@ -25,7 +25,7 @@ category_id: com.canonical.plainbox::wireless estimated_duration: 6 _description: Check system can find a wireless network AP nearby -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: {%- if __on_ubuntucore__ %} connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' @@ -48,7 +48,7 @@ command: wifi_nmcli_test.py secured {{ interface }} "$WPA_BG_SSID" "$WPA_BG_PSK" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: {%- if __on_ubuntucore__ %} connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' @@ -71,7 +71,7 @@ command: wifi_nmcli_test.py open {{ interface }} "$OPEN_BG_SSID" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: {%- if __on_ubuntucore__ %} connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' @@ -94,7 +94,7 @@ command: wifi_nmcli_test.py secured {{ interface }} "$WPA_N_SSID" "$WPA_N_PSK" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: {%- if __on_ubuntucore__ %} connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' @@ -117,7 +117,7 @@ command: wifi_nmcli_test.py open {{ interface }} "$OPEN_N_SSID" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: {%- if __on_ubuntucore__ %} connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager' @@ -140,7 +140,7 @@ command: wifi_nmcli_test.py secured {{ interface }} "$WPA_AC_SSID" "$WPA_AC_PSK" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ac == 'supported' {%- if __on_ubuntucore__ %} @@ -164,7 +164,7 @@ command: wifi_nmcli_test.py open {{ interface }} "$OPEN_AC_SSID" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ac == 'supported' {%- if __on_ubuntucore__ %} @@ -188,7 +188,7 @@ command: wifi_nmcli_test.py secured {{ interface }} "$WPA_AX_SSID" "$WPA_AX_PSK" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ax == 'supported' {%- if __on_ubuntucore__ %} @@ -212,7 +212,7 @@ command: wifi_nmcli_test.py open {{ interface }} "$OPEN_AX_SSID" category_id: com.canonical.plainbox::wireless estimated_duration: 30.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ax == 'supported' {%- if __on_ubuntucore__ %} @@ -536,7 +536,7 @@ user: root command: wifi_nmcli_backup.py save estimated_duration: 2.0 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend unit: template template-resource: device @@ -550,16 +550,4 @@ command: wifi_nmcli_backup.py restore estimated_duration: 2.0 depends: wireless/nm_connection_save_{interface} -flags: preserve-locale also-after-suspend also-after-suspend-manual - -unit: template -template-resource: device -template-filter: device.driver == 'iwlwifi' -id: wireless/check_iwlwifi_microcode_crash_{interface} -_summary: Check there have been no iwlwifi crashes -plugin: shell -command: check-iwlwifi-microcode-sw-error.sh -category_id: com.canonical.plainbox::wireless -estimated_duration: 30.0 flags: preserve-locale also-after-suspend -requires: package.name == 'systemd' diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu index d0458cc..91fb07e 100644 --- a/units/wireless/test-plan.pxu +++ b/units/wireless/test-plan.pxu @@ -21,7 +21,7 @@ _name: Wireless tests (after suspend) _description: Wireless connection tests (after suspend) include: nested_part: - after-suspend-manual-wireless-cert-automated + after-suspend-wireless-cert-automated id: wireless-cert-automated unit: test plan @@ -62,24 +62,6 @@ include: after-suspend-wireless/nm_connection_restore_.* after-suspend-wireless/check_iwlwifi_microcode_crash_.* -id: after-suspend-manual-wireless-cert-automated -unit: test plan -_name: Wireless tests (after manual suspend, automated) -_description: Wireless connection tests (after manual suspend, automated) -bootstrap_include: - device -include: - after-suspend-manual-wireless/nm_connection_save_.* - after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker - after-suspend-manual-wireless/nm_connection_restore_.* - id: wireless-cert-blockers unit: test plan _name: Wireless tests (certification blockers only) @@ -107,16 +89,16 @@ _description: bootstrap_include: device include: - after-suspend-manual-wireless/nm_connection_save_.* - after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker - after-suspend-manual-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker - after-suspend-manual-wireless/nm_connection_restore_.* + after-suspend-wireless/nm_connection_save_.* + after-suspend-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_n_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker + after-suspend-wireless/nm_connection_restore_.* id: wireless-full unit: test plan diff --git a/units/wireless/wireless-connection-netplan.pxu b/units/wireless/wireless-connection-netplan.pxu index 44677e2..12b29d8 100644 --- a/units/wireless/wireless-connection-netplan.pxu +++ b/units/wireless/wireless-connection-netplan.pxu @@ -16,7 +16,7 @@ user: root environ: LD_LIBRARY_PATH OPEN_AX_SSID NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ax == 'supported' net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' @@ -40,7 +40,7 @@ user: root environ: LD_LIBRARY_PATH OPEN_AC_SSID NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ac == 'supported' net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' @@ -65,7 +65,7 @@ user: root environ: LD_LIBRARY_PATH OPEN_BG_SSID NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' @@ -88,7 +88,7 @@ user: root environ: LD_LIBRARY_PATH OPEN_N_SSID NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' @@ -111,7 +111,7 @@ user: root environ: LD_LIBRARY_PATH WPA_AX_SSID WPA_AX_PSK NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ax == 'supported' net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' @@ -135,7 +135,7 @@ user: root environ: LD_LIBRARY_PATH WPA_AC_SSID WPA_AC_PSK NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ac == 'supported' net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' @@ -159,7 +159,7 @@ user: root environ: LD_LIBRARY_PATH WPA_BG_SSID WPA_BG_PSK NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' @@ -182,6 +182,6 @@ user: root environ: LD_LIBRARY_PATH WPA_N_SSID WPA_N_PSK NET_DRIVER_INFO category_id: com.canonical.plainbox::wireless estimated_duration: 15 -flags: preserve-locale also-after-suspend also-after-suspend-manual +flags: preserve-locale also-after-suspend requires: net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' diff --git a/units/wwan/jobs.pxu b/units/wwan/jobs.pxu index de4b1bc..93f9c68 100644 --- a/units/wwan/jobs.pxu +++ b/units/wwan/jobs.pxu @@ -110,7 +110,7 @@ _steps: _verification: Check the output. Was the modem listed? estimated_duration: 60s -flags: also-after-suspend-manual +flags: also-after-suspend imports: from com.canonical.plainbox import manifest category_id: wwan requires: @@ -128,7 +128,7 @@ _steps: _verification: Check the output. Was the SIM information printed? estimated_duration: 60s -flags: also-after-suspend-manual +flags: also-after-suspend imports: from com.canonical.plainbox import manifest category_id: wwan requires: @@ -160,7 +160,7 @@ _steps: _verification: Did the ping came back? estimated_duration: 120s -flags: also-after-suspend-manual +flags: also-after-suspend category_id: wwan imports: from com.canonical.plainbox import manifest requires: @@ -180,7 +180,7 @@ _steps: _verification: Were available networks listed? estimated_duration: 120s -flags: also-after-suspend-manual +flags: also-after-suspend category_id: wwan imports: from com.canonical.plainbox import manifest requires: @@ -220,7 +220,7 @@ _steps: _verification: Was the connection revived after plugging back in the antennae? estimate_duration: 120s -flags: also-after-suspend-manual +flags: also-after-suspend category_id: wwan imports: from com.canonical.plainbox import manifest requires: diff --git a/units/wwan/test-plan.pxu b/units/wwan/test-plan.pxu index 421b68f..e94157d 100644 --- a/units/wwan/test-plan.pxu +++ b/units/wwan/test-plan.pxu @@ -56,8 +56,8 @@ unit: test plan _name: Manual wwan tests (after suspend) _description: Manual wwan tests for Snappy Ubuntu Core devices include: - after-suspend-manual-wwan/detect-manual - after-suspend-manual-wwan/gsm-connection-manual - after-suspend-manual-wwan/check-sim-present-manual - after-suspend-manual-wwan/scan-networks-manual + after-suspend-wwan/detect-manual + after-suspend-wwan/gsm-connection-manual + after-suspend-wwan/check-sim-present-manual + after-suspend-wwan/scan-networks-manual after-suspend-wwan/gsm-connection-interrupted-manual |