From c60cbb3a115736b0ca77d05c2db44cb724a4d1c6 Mon Sep 17 00:00:00 2001 From: Sebastian Czapla Date: Thu, 23 Jan 2025 11:34:02 +0100 Subject: [PATCH] usb-type-a-devices-detection.robot: Fix flag for the USB-A tests There is variety in the flag name within codebase, and the name itself uses '-' which makes language server not happy, while editing code. Additionally, "Skip if not" mechanism cannot work in SUD002.001, since the skip condition happens on suite initialization stage anyways. Signed-off-by: Sebastian Czapla --- dasharo-stability/usb-type-a-devices-detection.robot | 5 ++--- platform-configs/include/default.robot | 2 +- platform-configs/include/msi-z690-common.robot | 2 +- platform-configs/include/novacustom-common.robot | 2 +- platform-configs/include/optiplex-common.robot | 2 +- platform-configs/include/pcengines.robot | 2 +- platform-configs/odroid-h4-plus.robot | 2 +- platform-configs/raptor-cs_talos2.robot | 2 +- platform-configs/rpi-3b.robot | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dasharo-stability/usb-type-a-devices-detection.robot b/dasharo-stability/usb-type-a-devices-detection.robot index e54579a88..5f21974e1 100644 --- a/dasharo-stability/usb-type-a-devices-detection.robot +++ b/dasharo-stability/usb-type-a-devices-detection.robot @@ -13,7 +13,7 @@ Resource ../keys.robot Suite Setup Run Keywords ... Prepare Test Suite ... AND -... Skip If not ${USB_TYPE-A_DEVICES_DETECTION_SUPPORT} USB-A devices detection tests not supported +... Skip If not ${USB_TYPE_A_DEVICES_DETECTION_SUPPORT} USB-A devices detection tests not supported ... AND ... Skip If ${STABILITY_DETECTION_SUSPEND_ITERATIONS} == 0 USB-A devices detection tests not supported ... AND @@ -28,7 +28,7 @@ Suite Teardown Run Keyword # SUD001.001 USB devices detection after cold boot (Ubuntu) # [Documentation] Check whether the external USB devices are detected # ... correctly after a cold boot. -# Skip If not ${usb_type-a_devices_detection_support} SUD001.001 not supported +# Skip If not ${USB_TYPE_A_DEVICES_DETECTION_SUPPORT} SUD001.001 not supported # Skip If not ${tests_in_ubuntu_support} SUD001.001 not supported # Skip If '${POWER_CTRL}' == 'none' Coldboot automatic tests not supported # Power On @@ -50,7 +50,6 @@ Suite Teardown Run Keyword SUD002.001 USB devices detection after warm boot (Ubuntu) [Documentation] Check whether the external USB devices are detected ... correctly after a warm boot. - Skip If not ${USB_TYPE-a_devices_detection_support} SUD002.001 not supported Skip If not ${TESTS_IN_UBUNTU_SUPPORT} SUD002.001 not supported Power On Boot System Or From Connected Disk ubuntu diff --git a/platform-configs/include/default.robot b/platform-configs/include/default.robot index d42a04732..bfdd0fb9b 100644 --- a/platform-configs/include/default.robot +++ b/platform-configs/include/default.robot @@ -218,7 +218,7 @@ ${MAX_ACCEPTABLE_REBOOT_TIME_S}= 20 ${M2_WIFI_SUPPORT}= ${FALSE} ${TPM_DETECT_SUPPORT}= ${FALSE} ${NVME_DETECTION_SUPPORT}= ${FALSE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${FALSE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${FALSE} ${NETWORK_INTERFACE_AFTER_SUSPEND_SUPPORT}= ${FALSE} ${CAPSULE_UPDATE_SUPPORT}= ${FALSE} diff --git a/platform-configs/include/msi-z690-common.robot b/platform-configs/include/msi-z690-common.robot index 8bb3083bf..fa6490ea1 100644 --- a/platform-configs/include/msi-z690-common.robot +++ b/platform-configs/include/msi-z690-common.robot @@ -110,7 +110,7 @@ ${CPU_FREQUENCY_MEASURE}= ${TRUE} # Test module: dasharo-stab ${TPM_DETECT_SUPPORT}= ${TRUE} ${NVME_DETECTION_SUPPORT}= ${TRUE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${TRUE} ${NETWORK_INTERFACE_AFTER_SUSPEND_SUPPORT}= ${TRUE} ${CAPSULE_UPDATE_SUPPORT}= ${TRUE} ${ROMHOLE_SUPPORT}= ${TRUE} diff --git a/platform-configs/include/novacustom-common.robot b/platform-configs/include/novacustom-common.robot index 245b3bb50..f52a6aba1 100644 --- a/platform-configs/include/novacustom-common.robot +++ b/platform-configs/include/novacustom-common.robot @@ -127,7 +127,7 @@ ${TEMPERATURE_TEST_DURATION}= 3600 # Test module: dasharo-stability ${M2_WIFI_SUPPORT}= ${TRUE} ${NVME_DETECTION_SUPPORT}= ${TRUE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${TRUE} ${TPM_DETECT_SUPPORT}= ${TRUE} ${NETWORK_INTERFACE_AFTER_SUSPEND_SUPPORT}= ${TRUE} diff --git a/platform-configs/include/optiplex-common.robot b/platform-configs/include/optiplex-common.robot index 6b6304178..88ef65dd1 100644 --- a/platform-configs/include/optiplex-common.robot +++ b/platform-configs/include/optiplex-common.robot @@ -82,7 +82,7 @@ ${CPU_FREQUENCY_MEASURE}= ${TRUE} # Test module: dasharo-stab ${TPM_DETECT_SUPPORT}= ${TRUE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${TRUE} ${NETWORK_INTERFACE_AFTER_SUSPEND_SUPPORT}= ${TRUE} ${RESET_TO_DEFAULTS_SUPPORT}= ${TRUE} diff --git a/platform-configs/include/pcengines.robot b/platform-configs/include/pcengines.robot index 5a066ab16..1215716d3 100644 --- a/platform-configs/include/pcengines.robot +++ b/platform-configs/include/pcengines.robot @@ -99,7 +99,7 @@ ${PLATFORM_STABILITY_CHECKING}= ${TRUE} # Test module: dasharo-stab ${TPM_DETECT_SUPPORT}= ${TRUE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${TRUE} # Test module: trenchboot ${TRENCHBOOT_SUPPORT}= ${TRUE} diff --git a/platform-configs/odroid-h4-plus.robot b/platform-configs/odroid-h4-plus.robot index 6eb3a5bab..f74c00d5d 100644 --- a/platform-configs/odroid-h4-plus.robot +++ b/platform-configs/odroid-h4-plus.robot @@ -105,7 +105,7 @@ ${USB_MASS_STORAGE_SUPPORT}= ${TRUE} # Dasharo stability ${NVME_DETECTION_SUPPORT}= ${TRUE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${TRUE} ${STABILITY_DETECTION_SUSPEND_ITERATIONS}= 5 diff --git a/platform-configs/raptor-cs_talos2.robot b/platform-configs/raptor-cs_talos2.robot index cc1c7b4dd..b062cb118 100644 --- a/platform-configs/raptor-cs_talos2.robot +++ b/platform-configs/raptor-cs_talos2.robot @@ -135,7 +135,7 @@ ${CUSTOM_FAN_CURVE_PERFORMANCE_MODE_SUPPORT}= ${FALSE} # Test module: dasharo-stability ${M2_WIFI_SUPPORT}= ${FALSE} ${NVME_DETECTION_SUPPORT}= ${FALSE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${FALSE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${FALSE} ${TPM_DETECT_SUPPORT}= ${TRUE} # Supported OS installation variants diff --git a/platform-configs/rpi-3b.robot b/platform-configs/rpi-3b.robot index e2a3c5632..0945cb691 100644 --- a/platform-configs/rpi-3b.robot +++ b/platform-configs/rpi-3b.robot @@ -145,7 +145,7 @@ ${CUSTOM_FAN_CURVE_PERFORMANCE_MODE_SUPPORT}= ${FALSE} # Test module: dasharo-stability ${M2_WIFI_SUPPORT}= ${FALSE} ${NVME_DETECTION_SUPPORT}= ${FALSE} -${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${FALSE} +${USB_TYPE_A_DEVICES_DETECTION_SUPPORT}= ${FALSE} ${TPM_DETECT_SUPPORT}= ${FALSE} # Supported OS installation variants