Change: switch 'depends: suspend/suspend_advanced' to 'depends: suspend/suspend_advanced_auto'

10 files changed, 104 insertions, 104 deletions

diff --git a/units/dock/jobs.pxu b/units/dock/jobs.pxu
index fb98be0..87b1b84 100644
--- a/units/dock/jobs.pxu
+++ b/units/dock/jobs.pxu
@@ -843,7 +843,7 @@ _description:
 plugin: user-interact
 category_id: dock-usb
 id: dock/usb-c/c-to-a-adapter/insert-after-suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 usb.usb3 == 'supported'
@@ -868,7 +868,7 @@ _verification:
 plugin: user-interact
 category_id: dock-usb
 id: dock/usb-c/insert-after-suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 usb.usb3 == 'supported'
@@ -1243,7 +1243,7 @@ command: audio_settings.py store --file="$PLAINBOX_SESSION_SHARE"/audio_settings
 id: dock/networking-gateway-ping-after-suspend
 category_id: dock-network
 plugin: shell
-depends: suspend/suspend_advanced ethernet/detect
+depends: suspend/suspend_advanced_auto ethernet/detect
 command: gateway_ping_test.py
 estimated_duration: 2.00
 _summary: Network gateway ping after suspend
@@ -1252,7 +1252,7 @@ _description: Tests whether the system has a working Internet connection.
 plugin: user-interact
 id: dock/usb-insert-after-suspend
 category_id: dock-usb
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 10.0
 _summary: USB drive insertion after resuming
 command: removable_storage_watcher.py insert usb
@@ -1274,7 +1274,7 @@ _verification:
 
 id: dock/power-button-after-suspend
 category_id: dock
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 plugin: manual
 estimated_duration: 30.00
 _summary: Docking test
@@ -1289,7 +1289,7 @@ _verification:
 plugin: user-interact
 id: dock/usb3-insert-after-suspend
 category_id: dock-usb
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 10.0
 _summary: USB3 drive insertion after resuming
 command: removable_storage_watcher.py -m 500000000 insert usb
@@ -1367,7 +1367,7 @@ _description:
 plugin: user-interact-verify
 id: dock/usb-HID-after-suspend
 category_id: dock-usb
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 _summary: USB HID device test after resuming
 command: keyboard_test.py
@@ -1382,7 +1382,7 @@ _verification:
 
 id: dock/monitor-displayport-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _summary: DisplayPort test on the dock after resuming
 plugin: manual
@@ -1397,7 +1397,7 @@ _verification:
 
 id: dock/monitor-dvi-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _summary: DVI port test on the dock after resuming
 plugin: manual
@@ -1412,7 +1412,7 @@ _verification:
 
 id: dock/monitor-hdmi-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _summary: HDMI port test on the dock after resuming
 plugin: manual
@@ -1427,7 +1427,7 @@ _verification:
 
 id: dock/monitor-vga-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _summary: VGA port test on the dock after resuming
 plugin: manual
@@ -1442,7 +1442,7 @@ _verification:
 
 id: dock/monitor_type-c_displayport-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120
 plugin: manual
 _summary: Display connected via DisplayPort using an USB Type-C port after resuming
@@ -1460,7 +1460,7 @@ _verification:
 
 id: dock/monitor_type-c_hdmi-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120
 plugin: manual
 _summary: Display connected via HDMI using an USB Type-C port after resuming
@@ -1478,7 +1478,7 @@ _verification:
 
 id: dock/monitor_type-c_vga-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120
 plugin: manual
 _summary: Display connected via VGA using an USB Type-C port after resuming
@@ -1496,7 +1496,7 @@ _verification:
 
 id: dock/monitor-dual-head-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _summary: Dual monitors test while docked after suspend
 plugin: manual
@@ -1513,7 +1513,7 @@ _verification:
 
 id: dock/monitor-triple-head-after-suspend
 category_id: dock-display
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _summary: Tripple monitors test while docked after suspend
 plugin: manual
@@ -2036,7 +2036,7 @@ _purpose:
 id: dock/hot-plug-after-suspend
 category_id: dock-hotplug
 plugin: manual
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 30.00
 _summary: Docking test
 _purpose:
@@ -2050,7 +2050,7 @@ _verification:
 plugin: user-interact-verify
 category_id: dock-hotplug
 id: dock/hotplug-ethernet-after-suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 command: network_check.py
 estimated_duration: 10
 _description:
diff --git a/units/dock/test-plan.pxu b/units/dock/test-plan.pxu
index f5bc162..b453a6c 100644
--- a/units/dock/test-plan.pxu
+++ b/units/dock/test-plan.pxu
@@ -103,7 +103,7 @@ include:
 # Do power on/off to clean up the test environment
 power-management/poweroff certification-status=blocker
 power-management/poweroff-log-attach
- suspend/suspend_advanced certification-status=blocker
+ suspend/suspend_advanced_auto certification-status=blocker
 dock/power-button-after-suspend certification-status=blocker
 dock/networking-gateway-ping-after-suspend certification-status=blocker
 dock/usb-HID-after-suspend certification-status=blocker
@@ -235,7 +235,7 @@ include:
 # Do power on/off to clean up the test environment
 power-management/poweroff certification-status=blocker
 power-management/poweroff-log-attach
- suspend/suspend_advanced certification-status=blocker
+ 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
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index 16ca11c..8725b0d 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -103,7 +103,7 @@ include:
 suspend/1_suspend_after_switch_to_card_.*_auto certification-status=blocker
 # The following after suspend jobs will automatically select the right suspend job
 # depending on the amount of graphic cards available on the SUT:
- # suspend/suspend_advanced (one GPU)
+ # suspend/suspend_advanced_auto (one GPU)
 # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs)
 suspend/1_suspend-time-check_.*_auto certification-status=non-blocker
 suspend/1_suspend-single-log-attach_.*_auto certification-status=non-blocker
@@ -118,7 +118,7 @@ _description: After suspend tests (integrated GPU manual)
 include:
 # The following after suspend jobs will automatically select the right suspend job
 # depending on the amount of graphic cards available on the SUT:
- # suspend/suspend_advanced (one GPU)
+ # suspend/suspend_advanced_auto (one GPU)
 # or suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto (two GPUs)
 power-management/lid certification-status=blocker
 power-management/lid_close certification-status=blocker
diff --git a/units/led/jobs.pxu b/units/led/jobs.pxu
index 1ff3c38..b1be9d0 100644
--- a/units/led/jobs.pxu
+++ b/units/led/jobs.pxu
@@ -27,7 +27,7 @@ plugin: manual
 category_id: led
 id: led/suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 _description:
 PURPOSE:
 Suspend LED verification.
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index 544e7af..595e7d4 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -106,7 +106,7 @@ id: power-management/suspend_30_cycles
 estimated_duration: 2400.0
 depends:
 power-management/rtc
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 environ: PLAINBOX_SESSION_SHARE
 user: root
 command:
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index 9a52fbb..22c3d9a 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -64,7 +64,7 @@ depends:
 {%- if gpu_count > "1" %}
 suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
 {%- else %}
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 {%- endif %}
 _summary: Test display function after suspend for {{ vendor }} {{ product }}
 _description:
@@ -87,7 +87,7 @@ depends:
 {%- if gpu_count > "1" %}
 suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
 {%- else %}
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 {%- endif %}
 estimated_duration: 120.0
 command:
@@ -144,7 +144,7 @@ depends:
 {%- if gpu_count > "1" %}
 suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
 {%- else %}
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 {%- endif %}
 requires: executable.name == 'glxgears'
 command:
@@ -171,7 +171,7 @@ depends:
 {%- if gpu_count > "1" %}
 suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
 {%- else %}
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 {%- endif %}
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
@@ -255,7 +255,7 @@ category_id: com.canonical.plainbox::stress
 estimated_duration: 5400.0
 depends:
 power-management/rtc
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 graphics/{index}_auto_switch_card_{product_slug}
 flags: noreturn autorestart
 user: root
@@ -281,7 +281,7 @@ depends:
 {%- if gpu_count > "1" %}
 suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto
 {%- else %}
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 {%- endif %}
 command:
 # shellcheck disable=SC1091
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 8c25a91..d16bee6 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -234,7 +234,7 @@ id: suspend/{index}_suspend_after_switch_to_card_{product_slug}
 requires:
 sleep.mem == 'supported'
 rtc.state == 'supported'
-depends: suspend/suspend_advanced graphics/{index}_switch_card_{product_slug}
+depends: suspend/suspend_advanced_auto graphics/{index}_switch_card_{product_slug}
 user: root
 environ: PLAINBOX_SESSION_SHARE
 command:
@@ -385,7 +385,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: power-management/usb_wakeup_keyboard
 user: root
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 command: pm-suspend
 _description:
@@ -402,7 +402,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: power-management/usb_wakeup_mouse
 user: root
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 command: pm-suspend
 _description:
@@ -419,7 +419,7 @@ plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/network_after_suspend
 estimated_duration: 20.0
-depends: suspend/suspend_advanced suspend/network_before_suspend
+depends: suspend/suspend_advanced_auto suspend/network_before_suspend
 _description: Test the network after resuming.
 command: network_wait.sh; gateway_ping_test.py | diff "$PLAINBOX_SESSION_SHARE"/network_before_suspend.txt -
 
@@ -434,7 +434,7 @@ command: network_wait.sh; gateway_ping_test.py | diff "$PLAINBOX_SESSION_SHARE"/
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/resolution_after_suspend
-depends: suspend/suspend_advanced suspend/resolution_before_suspend
+depends: suspend/suspend_advanced_auto suspend/resolution_before_suspend
 estimated_duration: 1.2
 _description: Test to see that we have the same resolution after resuming as before.
 command: xrandr -q | grep "[*]" | awk '{print $1}' | diff "$PLAINBOX_SESSION_SHARE"/resolution_before_suspend.txt -
@@ -457,7 +457,7 @@ estimated_duration: 1.0
 requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
-depends: suspend/suspend_advanced suspend/audio_before_suspend
+depends: suspend/suspend_advanced_auto suspend/audio_before_suspend
 _description: Verify that mixer settings after suspend are the same as before suspend.
 command:
 audio_settings.py store --file="$PLAINBOX_SESSION_SHARE"/audio_settings_after_suspend
@@ -479,7 +479,7 @@ command:
 plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: suspend/speaker-headphone-plug-detection-after-suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 60.0
 requires:
 device.category == 'AUDIO'
@@ -501,7 +501,7 @@ _description:
 plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: suspend/microphone-plug-detection-after-suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 60.0
 requires:
 device.category == 'AUDIO'
@@ -525,7 +525,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/playback_headphones-after-suspend
 estimated_duration: 20.0
-depends: audio/list_devices suspend/suspend_advanced
+depends: audio/list_devices suspend/suspend_advanced_auto
 requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
@@ -551,7 +551,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/alsa_record_playback_external-after-suspend
 estimated_duration: 20.0
-depends: suspend/playback_headphones-after-suspend suspend/suspend_advanced
+depends: suspend/playback_headphones-after-suspend suspend/suspend_advanced_auto
 requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
@@ -578,7 +578,7 @@ plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/cpu_after_suspend
 estimated_duration: 1.2
-depends: suspend/suspend_advanced suspend/cpu_before_suspend
+depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
 command: cpuinfo_resource.py | diff "$PLAINBOX_SESSION_SHARE"/cpuinfo_before_suspend -
 
@@ -594,7 +594,7 @@ plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/memory_after_suspend
 estimated_duration: 1.2
-depends: suspend/suspend_advanced suspend/memory_before_suspend
+depends: suspend/suspend_advanced_auto suspend/memory_before_suspend
 _description:
 Verify that all memory is available after resuming from suspend.
 command: meminfo_resource.py | diff "$PLAINBOX_SESSION_SHARE"/meminfo_before_suspend -
@@ -612,7 +612,7 @@ plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/display_after_suspend
 estimated_duration: 120.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 _description:
 PURPOSE:
 This test will check that the display is correct after suspend and resume
@@ -643,7 +643,7 @@ template-filter: device.category == 'NETWORK'
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/iperf_after_suspend_ether_auto_device{__index__}_{interface}
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 30.0
 requires:
 package.name == 'iperf'
@@ -659,7 +659,7 @@ template-filter: device.category == 'WIRELESS'
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/iperf_after_suspend_wifi_auto_device{__index__}_{interface}
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 30.0
 requires:
 package.name == 'iperf'
@@ -700,7 +700,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/wireless_connection_after_suspend_wpa_bg_manual
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
@@ -741,7 +741,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/wireless_connection_after_suspend_open_bg_manual
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
@@ -782,7 +782,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/wireless_connection_after_suspend_wpa_n_manual
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
@@ -823,7 +823,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/wireless_connection_after_suspend_open_n_manual
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
@@ -864,7 +864,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/wireless_connection_after_suspend_wpa_ac_manual
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
@@ -905,7 +905,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/wireless_connection_after_suspend_open_ac_manual
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 requires:
 device.category == 'WIRELESS'
@@ -946,7 +946,7 @@ _description:
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/bluetooth_detect_after_suspend
-depends: suspend/suspend_advanced bluetooth/detect-output
+depends: suspend/suspend_advanced_auto bluetooth/detect-output
 estimated_duration: 1.2
 requires:
 package.name == 'bluez'
@@ -998,7 +998,7 @@ _description:
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/bluetooth_obex_send_after_suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 10.0
 requires:
 package.name == 'bluez'
@@ -1056,7 +1056,7 @@ _description:
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/bluetooth_obex_browse_after_suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 10.0
 requires:
 package.name == 'bluez'
@@ -1115,7 +1115,7 @@ plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/bluetooth_obex_get_after_suspend
 estimated_duration: 20.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 requires:
 package.name == 'bluez'
 executable.name == 'obexftp'
@@ -1174,7 +1174,7 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/cycle_resolutions_after_suspend
 estimated_duration: 120.0
 requires: package.name == 'xorg'
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 command: xrandr_cycle.py --keyword=after_suspend --screenshot-dir "$PLAINBOX_SESSION_SHARE"
 _description:
 PURPOSE:
@@ -1234,7 +1234,7 @@ plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/record_playback_after_suspend
 estimated_duration: 10.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 requires:
 package.name == 'python3-gi'
 package.name == 'gir1.2-gstreamer-1.0'
@@ -1317,7 +1317,7 @@ _description:
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/wifi_resume_time
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 requires:
 device.category == 'WIRELESS'
 command: network_reconnect_resume_test.py -t 90 -d wifi
@@ -1341,7 +1341,7 @@ _description:
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/network_resume_time
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 1.2
 requires:
 device.category == 'NETWORK'
@@ -1365,7 +1365,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/power
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1379,7 +1379,7 @@ plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/battery-charging
 estimated_duration: 120.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 _description:
 PURPOSE:
 Validate that the battery light shows charging status after resuming from suspend
@@ -1392,7 +1392,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/battery-charged
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1407,7 +1407,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/battery-low
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1421,7 +1421,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/hdd
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 command: led_hdd_test.sh
 _description:
@@ -1437,7 +1437,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/numeric-keypad
 estimated_duration: 120.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 command: keyboard_test.py
 _description:
 PURPOSE:
@@ -1453,7 +1453,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/caps-lock
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1467,7 +1467,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/wlan
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1481,7 +1481,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/wlan-disabled
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1497,7 +1497,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/bluetooth
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1513,7 +1513,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/touchpad
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1529,7 +1529,7 @@ _description:
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/led_after_suspend/wireless
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -1549,7 +1549,7 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/usb_insert_after_suspend
 estimated_duration: 30.0
 depends:
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 command: removable_storage_watcher.py insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
@@ -1571,7 +1571,7 @@ estimated_duration: 30.0
 requires:
 usb.usb3 == 'supported'
 depends:
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
@@ -1676,7 +1676,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: suspend/mmc-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -1727,7 +1727,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: suspend/sd-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -1780,7 +1780,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: suspend/sdhc-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -1832,7 +1832,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: mediacard/cf-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -1883,7 +1883,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: mediacard/sdxc-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -1934,7 +1934,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: mediacard/ms-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -1985,7 +1985,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: mediacard/msp-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -2036,7 +2036,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::suspend
 id: mediacard/xd-insert-after-suspend
 estimated_duration: 30.0
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -2116,7 +2116,7 @@ template-filter: device.category == 'MOUSE' or device.category == 'TOUCHPAD' or
 plugin: manual
 category_id: com.canonical.plainbox::suspend
 id: suspend/pointing-after-suspend_{product_slug}_{category}_{__index__}
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 _description:
 PURPOSE:
 This will test your {product} device after suspend.
@@ -2132,7 +2132,7 @@ plugin: manual
 category_id: com.canonical.plainbox::suspend
 estimated_duration: 30.0
 id: suspend/clicking-after-suspend_{product_slug}_{category}_{__index__}
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 _summary: Check post suspend button functionality for {product}
 _description:
 PURPOSE:
@@ -2161,7 +2161,7 @@ _summary: Test OpenGL support for {product} after suspend
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/gl_support_after_suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 requires: package.name == 'nux-tools'
 command: /usr/lib/nux/unity_support_test -p 2>&1
 estimated_duration: 0.130
@@ -2190,7 +2190,7 @@ _description:
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/glxgears_after_suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 requires:
 executable.name == 'glxgears'
 device.category == 'VIDEO'
@@ -2228,7 +2228,7 @@ _description:
 id: suspend/video_after_suspend
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 requires:
 device.category == 'VIDEO'
 package.name == 'xorg'
@@ -2257,7 +2257,7 @@ _summary: Test X driver/version after suspend for {vendor} {product}
 
 id: suspend/driver_version_after_suspend
 requires: device.category == 'VIDEO'
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 command: graphics_driver
@@ -2266,7 +2266,7 @@ _description: Parses Xorg.0.Log and discovers the running X driver and version a
 _summary: Test X driver/version after suspend
 
 id: suspend/oops_after_suspend
-depends: suspend/suspend_advanced
+depends: suspend/suspend_advanced_auto
 plugin:shell
 estimated_duration: 10.0
 requires: executable.name == 'fwts'
diff --git a/units/suspend/test-plan.pxu b/units/suspend/test-plan.pxu
index 66b38a2..5d1cfeb 100644
--- a/units/suspend/test-plan.pxu
+++ b/units/suspend/test-plan.pxu
@@ -126,7 +126,7 @@ _description:
 execution order, by placing it between before-suspend-tp and after-suspend-tp
 in the nested_part section of the surrounding test plan.
 include:
- suspend/suspend_advanced
+ suspend/suspend_advanced_auto
 
 id: hibernate-tp-manual
 unit: test plan
diff --git a/units/thunderbolt/jobs.pxu b/units/thunderbolt/jobs.pxu
index 031c2ad..4b59ee8 100644
--- a/units/thunderbolt/jobs.pxu
+++ b/units/thunderbolt/jobs.pxu
@@ -8,7 +8,7 @@ command: removable_storage_watcher.py insert --timeout 40 scsi
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt/insert",
 "_summary": "thunderbolt/insert after suspend",
- "depends": "suspend/suspend_advanced"}
+ "depends": "suspend/suspend_advanced_auto"}
 ]
 _summary: Storage insert detection on Thunderbolt
 _description:
@@ -100,7 +100,7 @@ command: removable_storage_watcher.py insert --timeout 40 scsi
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt3/insert",
 "_summary": "thunderbolt3/insert after suspend",
- "depends": "suspend/suspend_advanced"}
+ "depends": "suspend/suspend_advanced_auto"}
 ]
 _summary: Storage insert detection on Thunderbolt 3 port
 _description:
diff --git a/units/touchpad/jobs.pxu b/units/touchpad/jobs.pxu
index 220b3c9..95dfc5b 100644
--- a/units/touchpad/jobs.pxu
+++ b/units/touchpad/jobs.pxu
@@ -12,7 +12,7 @@ _verification:
 Did the cursor move?
 _siblings:
 [{ "id": "touchpad/basic-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/basic" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/basic" }]
 
 plugin: user-interact
 category_id: com.canonical.plainbox::touchpad
@@ -31,7 +31,7 @@ _verification:
 Could you scroll right and left?
 _siblings:
 [{ "id": "touchpad/horizontal-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/horizontal" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/horizontal" }]
 
 plugin: user-interact
 category_id: com.canonical.plainbox::touchpad
@@ -50,7 +50,7 @@ _verification:
 Could you scroll up and down?
 _siblings:
 [{ "id": "touchpad/vertical-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/vertical" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/vertical" }]
 
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
@@ -65,7 +65,7 @@ _verification:
 Is the touchpad supposed to be multitouch?
 _siblings:
 [{ "id": "touchpad/multitouch-manual-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/multitouch-manual" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/multitouch-manual" }]
 
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
@@ -81,7 +81,7 @@ _verification:
 Did a selection window open and were several files selected?
 _siblings:
 [{ "id": "touchpad/singletouch-selection-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/singletouch-selection" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/singletouch-selection" }]
 
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
@@ -98,7 +98,7 @@ _verification:
 Did the right click pop up menu appear?
 _siblings:
 [{ "id": "touchpad/multitouch-rightclick-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/multitouch-rightclick" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/multitouch-rightclick" }]
 
 plugin: user-interact
 category_id: com.canonical.plainbox::touchpad
@@ -115,7 +115,7 @@ _verification:
 Could you scroll right and left?
 _siblings:
 [{ "id": "touchpad/multitouch-horizontal-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/multitouch-horizontal" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/multitouch-horizontal" }]
 
 plugin: user-interact
 category_id: com.canonical.plainbox::touchpad
@@ -132,7 +132,7 @@ _verification:
 Could you scroll up and down?
 _siblings:
 [{ "id": "touchpad/multitouch-vertical-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/multitouch-vertical" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/multitouch-vertical" }]
 
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
@@ -150,7 +150,7 @@ _verification:
 Does drag and drop work on Touchpad?
 _siblings:
 [{ "id": "touchpad/drag-and-drop-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/drag-and-drop" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/drag-and-drop" }]
 
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
@@ -181,7 +181,7 @@ _verification:
 Did the tap open the Dash?
 _siblings:
 [{ "id": "touchpad/multitouch-dash-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/multitouch-dash",
+ "depends": "suspend/suspend_advanced_auto touchpad/multitouch-dash",
 "_summary": "Check 4-finger tap gesture after suspend (S3)" }]
 
 plugin: shell
@@ -200,7 +200,7 @@ _purpose:
 This test will check if your touchpad was detected as a mouse.
 _siblings:
 [{ "id": "touchpad/detected-as-mouse-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/detected-as-mouse" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/detected-as-mouse" }]
 
 plugin: user-interact
 category_id: com.canonical.plainbox::touchpad
@@ -217,7 +217,7 @@ _verification:
 Did the mouse cursor move without interruption?
 _siblings:
 [{ "id": "touchpad/continuous-move-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/continuous-move" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/continuous-move" }]
 
 unit: template
 template-resource: device
@@ -247,5 +247,5 @@ _verification:
 Cursor should not have moved.
 _siblings:
 [{ "id": "touchpad/palm-rejection-after-suspend",
- "depends": "suspend/suspend_advanced touchpad/palm-rejection" }]
+ "depends": "suspend/suspend_advanced_auto touchpad/palm-rejection" }]
 estimated_duration: 40