Fix incorrect skip, import, and desc

This commit brings two keywords in line with their descriptions. Now, sound device detection on windows detects all devices, not only audio sinks. Additionally, fix broken import and skip condition. Signed-off-by: Sebastian Czapla <[email protected]>
Dasharo · Dec 9, 2024 · c9cc95e · c9cc95e
1 parent ac9f446
commit c9cc95e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dasharo-compatibility/device-detection.robot b/dasharo-compatibility/device-detection.robot
@@ -8,8 +8,6 @@ Library             SSHLibrary    timeout=90 seconds
 Library             RequestsLibrary
 # TODO: maybe have a single file to include if we need to include the same
 # stuff in all test cases
-Resource            ../sonoff-rest-api/sonoff-api.robot
-Resource            ../rtectrl-rest-api/rtectrl.robot
 Resource            ../variables.robot
 Resource            ../keywords.robot
 Resource            ../keys.robot

diff --git a/dasharo-compatibility/usb-boot.robot b/dasharo-compatibility/usb-boot.robot
@@ -20,7 +20,8 @@ Resource            ../pikvm-rest-api/pikvm_comm.robot
 Suite Setup         Run Keywords
 ...                     Prepare Test Suite
 ...                     AND
-...                     Skip If    ${BOOT_FROM_USB_ITERATIONS_NUMBER} == 0    USB booting tests skipped
+...                     Skip If    "${BOOT_FROM_USB_ITERATIONS_NUMBER}" == "0"    USB booting tests skipped
+...                     AND
 ...                     Skip If    not ${TESTS_IN_FIRMWARE_SUPPORT}    Tests in firmware not supported
 Suite Teardown      Run Keyword
 ...                     Log Out And Close Connection

diff --git a/keywords.robot b/keywords.robot
@@ -754,11 +754,12 @@ Get Power Supply State
 Get Sound Devices Windows
     [Documentation]    Get and return all sound devices in Windows OS using
     ...    PowerShell
-    ${out}=    Execute Command In Terminal    Get-WmiObject -class Win32_SoundDevice
+    ${out}=    Execute Command In Terminal
+    ...    Get-PnpDevice -PresentOnly | Where-Object {$_.Class -match "Audio" -or $_.Name -match "Audio"} | Select-Object Name, Status
     RETURN    ${out}
 
 Get USB Devices Windows
-    [Documentation]    Get and return all sound devices in Windows OS using
+    [Documentation]    Get and return all USB devices in Windows OS using
     ...    PowerShell
     ${out}=    Execute Command In Terminal    Get-PnpDevice -PresentOnly | Where-Object { $_.InstanceId -match '^USB' }
     RETURN    ${out}