From 64bd605e04c6cd7cbc8f8d714b22ecd5c31c6a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Go=C5=82a=C5=9B?= <filip.golas@3mdeb.com>
Date: Mon, 9 Jun 2025 08:09:39 +0200
Subject: [PATCH 1/3] utc_generator.py: Restore docking station agnostic test
 cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filip Gołaś <filip.golas@3mdeb.com>
---
 scripts/utc_generator.py | 82 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 8 deletions(-)

diff --git a/scripts/utc_generator.py b/scripts/utc_generator.py
index b7ab77001d..9b40392073 100644
--- a/scripts/utc_generator.py
+++ b/scripts/utc_generator.py
@@ -14,10 +14,11 @@
 }
 
 # Every test performed on two states of ME
-me_states = [True, False]
+me_states = [None, True, False]
 
 # Every test on every docking station
 docking_stations = {
+    "0": None,
     "1": "WL-UMD05 Pro Rev.E",
     "2": "WL-UMD05 Pro Rev.C1",
     "3": "WL-UG69PD2 Rev.A1",
@@ -30,6 +31,8 @@
     ...    charging to a connected smartphone.""",
         "skips": "",
         "automation": "manual",
+        "docking-stations": ["0"],
+        "me-states": [True, False],
     },
     "Thunderbolt 4 USB Type-C power output": {
         "env_ids": ["001"],
@@ -37,6 +40,8 @@
     ...    to provide charging to a USB Type-C accessory.""",
         "skips": "",
         "automation": "manual",
+        "docking-stations": ["0"],
+        "me-states": [True, False],
     },
     "USB Type-C PD power input": {
         "env_ids": ["201", "202", "301"],
@@ -46,12 +51,17 @@
     ...    Previous IDs: UTC021.001 USB Type-C laptop charging (Ubuntu)""",
         "skips": ["not ${DOCKING_STATION_USB_C_CHARGING_SUPPORT}"],
         "automation": "manual",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C Display output": {
         "env_ids": ["201", "202"],
-        "doc": "Check whether the DUT can detect the USB Type-C hub.",
+        "doc": """Check whether a display connected to the USB Type-C port
+    ...    is recognized by the OPERATING_SYSTEM.""",
         "skips": ["not ${USB_TYPE_C_DISPLAY_SUPPORT}"],
-        "automation": "auto",
+        "automation": "manual",
+        "docking-stations": ["0"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station HDMI display": {
         "env_ids": ["201", "202", "301"],
@@ -60,6 +70,8 @@
     ...    recognized by the OPERATING_SYSTEM.""",
         "skips": ["not ${DOCKING_STATION_HDMI}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station DP display": {
         "env_ids": ["201", "202", "301"],
@@ -68,6 +80,8 @@
     ...    recognized by the OPERATING_SYSTEM.""",
         "skips": ["not ${DOCKING_STATION_DISPLAY_PORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station Triple display": {
         "env_ids": ["201", "202", "301"],
@@ -76,6 +90,8 @@
     ...    recognized by the OPERATING_SYSTEM.""",
         "skips": "",
         "automation": "manual",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station USB devices recognition": {
         "env_ids": ["001", "201", "202", "301"],
@@ -83,6 +99,8 @@
     ...    docking station are detected correctly""",
         "skips": ["not ${DOCKING_STATION_USB_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station USB keyboard": {
         "env_ids": ["001", "201", "202", "301"],
@@ -90,6 +108,8 @@
     ...    docking station is detected correctly.""",
         "skips": ["not ${DOCKING_STATION_KEYBOARD_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station upload 1GB file on USB storage": {
         "env_ids": ["201", "202", "301"],
@@ -98,6 +118,8 @@
     ...    connected to the docking station.""",
         "skips": "",
         "automation": "manual",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station Ethernet connection": {
         "env_ids": ["201", "202", "301"],
@@ -106,6 +128,8 @@
     ...    OPERATING_SYSTEM.""",
         "skips": ["not ${DOCKING_STATION_NET_INTERFACE}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station audio recognition": {
         "env_ids": ["201", "202"],
@@ -114,6 +138,8 @@
     ...    the docking station.""",
         "skips": ["not ${DOCKING_STATION_AUDIO_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station audio playback": {
         "env_ids": ["201", "202", "301"],
@@ -122,6 +148,8 @@
     ...    speakers connected to the docking station.""",
         "skips": ["not ${DOCKING_STATION_AUDIO_SUPPORT}"],
         "automation": "manual",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station audio capture": {
         "env_ids": ["201", "202", "301"],
@@ -130,6 +158,8 @@
     ...    docking station.""",
         "skips": ["not ${DOCKING_STATION_AUDIO_SUPPORT}"],
         "automation": "manual",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station SD Card reader detection": {
         "env_ids": ["201", "202", "301"],
@@ -137,6 +167,8 @@
     ...    and can be detected from the operating system.""",
         "skips": ["not ${DOCKING_STATION_SD_CARD_READER_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C docking station SD Card read/write": {
         "env_ids": ["201", "202", "301"],
@@ -144,6 +176,8 @@
     ...    and can be used from the operating system.""",
         "skips": ["not ${DOCKING_STATION_SD_CARD_READER_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "USB Type-C PD current limiting": {
         "env_ids": ["201", "202", "301"],
@@ -152,6 +186,8 @@
     ...    specifications.""",
         "skips": "",
         "automation": "manual",
+        "docking-stations": ["0"],
+        "me-states": [True, False],
     },
     "Docking station detection after coldboot": {
         "env_ids": ["201", "202"],
@@ -159,6 +195,8 @@
     ...    after coldboot.""",
         "skips": ["'${POWER_CTRL}' == 'none'", "not ${DOCKING_STATION_DETECT_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after warmboot": {
         "env_ids": ["201", "202"],
@@ -166,6 +204,8 @@
     ...    after warmboot.""",
         "skips": ["not ${DOCKING_STATION_DETECT_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after reboot": {
         "env_ids": ["201", "202"],
@@ -173,6 +213,8 @@
     ...    after reboot.""",
         "skips": ["not ${DOCKING_STATION_DETECT_SUPPORT}"],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after suspend": {
         "env_ids": ["201", "202"],
@@ -183,6 +225,8 @@
             "not ${DOCKING_STATION_DETECT_SUPPORT}",
         ],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after suspend (S0ix)": {
         "env_ids": ["201", "202"],
@@ -193,6 +237,8 @@
             "not ${DOCKING_STATION_DETECT_SUPPORT}",
         ],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after suspend (S3)": {
         "env_ids": ["201", "202"],
@@ -203,6 +249,8 @@
             "not ${DOCKING_STATION_DETECT_SUPPORT}",
         ],
         "automation": "auto",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after coldboot then hotplug": {
         "env_ids": ["201", "202"],
@@ -210,6 +258,8 @@
     ...    after coldboot then hotplug.""",
         "skips": ["'${POWER_CTRL}' == 'none'", "not ${DOCKING_STATION_DETECT_SUPPORT}"],
         "automation": "semi",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after warmboot then hotplug": {
         "env_ids": ["201", "202"],
@@ -217,6 +267,8 @@
     ...    after warmboot then hotplug.""",
         "skips": ["not ${DOCKING_STATION_DETECT_SUPPORT}"],
         "automation": "semi",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after reboot then hotplug": {
         "env_ids": ["201", "202"],
@@ -224,6 +276,8 @@
     ...    after reboot then hotplug.""",
         "skips": ["not ${DOCKING_STATION_DETECT_SUPPORT}"],
         "automation": "semi",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after suspend then hotplug": {
         "env_ids": ["201", "202"],
@@ -234,6 +288,8 @@
             "not ${DOCKING_STATION_DETECT_SUPPORT}",
         ],
         "automation": "semi",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after suspend then hotplug (S0ix)": {
         "env_ids": ["201", "202"],
@@ -244,6 +300,8 @@
             "not ${DOCKING_STATION_DETECT_SUPPORT}",
         ],
         "automation": "semi",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
     "Docking station detection after suspend then hotplug (S3)": {
         "env_ids": ["201", "202"],
@@ -254,13 +312,15 @@
             "not ${DOCKING_STATION_DETECT_SUPPORT}",
         ],
         "automation": "semi",
+        "docking-stations": ["1", "2", "3"],
+        "me-states": [True, False],
     },
 }
 
 # Generate full test list
 test_rows = []
 for dock_idx in docking_stations.keys():
-    for me_enabled in me_states:
+    for me_state in me_states:
         for os in oses:
             # find out test cases on given os
             # to order them by OS and possibly speeding up execution
@@ -269,8 +329,12 @@
             ]
 
             for test_name in tests_for_os:
+                if dock_idx not in test_names[test_name]["docking-stations"]:
+                    continue
+                if me_state not in test_names[test_name]["me-states"]:
+                    continue
                 test_idx = list(test_names.keys()).index(test_name) * 2 + 1
-                if not me_enabled:
+                if not me_state:
                     test_idx += 1
                 test_id = f"UTC{dock_idx}{test_idx:02d}.{os}"
                 test_rows.append(
@@ -280,7 +344,7 @@
                         "doc": test_names[test_name]["doc"],
                         "skips": test_names[test_name]["skips"],
                         "OS ID": os,
-                        "ME State": "Enabled" if me_enabled else "Disabled",
+                        "ME State": "Enabled" if me_state else "Disabled",
                         "Dock": docking_stations[dock_idx],
                         "automation": test_names[test_name]["automation"],
                     }
@@ -292,8 +356,10 @@ def full_test_name(test_row):
     line += f"{test_row['Test ID']}"
     line += f" {test_row['Test Name']}"
     line += f" ({oses[test_row['OS ID']]})"
-    line += f" (ME: {test_row['ME State']})"
-    line += f" ({test_row['Dock']})"
+    if test_row["ME State"] is not None:
+        line += f" (ME: {test_row['ME State']})"
+    if test_row["Dock"] is not None:
+        line += f" ({test_row['Dock']})"
     return line
 
 

From dbc919e5d6430a534aaab6a774241caa69a38ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Go=C5=82a=C5=9B?= <filip.golas@3mdeb.com>
Date: Mon, 9 Jun 2025 08:12:16 +0200
Subject: [PATCH 2/3] usb-type-c.robot: Restore docking station agnostic test
 cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filip Gołaś <filip.golas@3mdeb.com>
---
 dasharo-compatibility/usb-type-c.robot | 392 +++++++------------------
 1 file changed, 100 insertions(+), 292 deletions(-)

diff --git a/dasharo-compatibility/usb-type-c.robot b/dasharo-compatibility/usb-type-c.robot
index 2e72d98e24..bbc582bf8f 100644
--- a/dasharo-compatibility/usb-type-c.robot
+++ b/dasharo-compatibility/usb-type-c.robot
@@ -22,16 +22,112 @@ Suite Teardown      Run Keyword
 
 *** Test Cases ***
 # Not automated
-# UTC101.001 USB Type-A charging capability (Firmware) (ME: Enabled) (WL-UMD05 Pro Rev.E)
+# UTC001.001 USB Type-A charging capability (Firmware) (ME: Enabled)
 #    [Documentation]    This test verifies that the USB-A ports are able to provide
 #    ...    charging to a connected smartphone.
-#    Usb Type-A Charging Capability    001    Enabled    WL-UMD05 Pro Rev.E
+#    Usb Type-A Charging Capability    001    Enabled    None
 
 # Not automated
-# UTC103.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Enabled) (WL-UMD05 Pro Rev.E)
+# UTC003.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Enabled)
 #    [Documentation]    This test verifies that the Thunderbolt 4 port is able
 #    ...    to provide charging to a USB Type-C accessory.
-#    Thunderbolt 4 Usb Type-C Power Output    001    Enabled    WL-UMD05 Pro Rev.E
+#    Thunderbolt 4 Usb Type-C Power Output    001    Enabled    None
+
+# Not automated
+# UTC007.201 USB Type-C Display output (Ubuntu) (ME: Enabled)
+#    [Documentation]    Check whether a display connected to the USB Type-C port
+#    ...    is recognized by the OPERATING_SYSTEM.
+#    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC007.201 not supported
+#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC007.201 not supported
+#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC007.201 not supported
+#    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Enabled    None
+
+# Not automated
+# UTC033.201 USB Type-C PD current limiting (Ubuntu) (ME: Enabled)
+#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
+#    ...    power supply does not exceed the limits of the power supply's
+#    ...    specifications.
+#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC033.201 not supported
+#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC033.201 not supported
+#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Enabled    None
+
+# Not automated
+# UTC007.202 USB Type-C Display output (Fedora) (ME: Enabled)
+#    [Documentation]    Check whether a display connected to the USB Type-C port
+#    ...    is recognized by the OPERATING_SYSTEM.
+#    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC007.202 not supported
+#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC007.202 not supported
+#    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Enabled    None
+
+# Not automated
+# UTC033.202 USB Type-C PD current limiting (Fedora) (ME: Enabled)
+#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
+#    ...    power supply does not exceed the limits of the power supply's
+#    ...    specifications.
+#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC033.202 not supported
+#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Enabled    None
+
+# Not automated
+# UTC033.301 USB Type-C PD current limiting (Windows) (ME: Enabled)
+#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
+#    ...    power supply does not exceed the limits of the power supply's
+#    ...    specifications.
+#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC033.301 not supported
+#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Enabled    None
+
+# Not automated
+# UTC002.001 USB Type-A charging capability (Firmware) (ME: Disabled)
+#    [Documentation]    This test verifies that the USB-A ports are able to provide
+#    ...    charging to a connected smartphone.
+#    Usb Type-A Charging Capability    001    Disabled    None
+
+# Not automated
+# UTC004.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Disabled)
+#    [Documentation]    This test verifies that the Thunderbolt 4 port is able
+#    ...    to provide charging to a USB Type-C accessory.
+#    Thunderbolt 4 Usb Type-C Power Output    001    Disabled    None
+
+# Not automated
+# UTC008.201 USB Type-C Display output (Ubuntu) (ME: Disabled)
+#    [Documentation]    Check whether a display connected to the USB Type-C port
+#    ...    is recognized by the OPERATING_SYSTEM.
+#    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC008.201 not supported
+#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC008.201 not supported
+#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC008.201 not supported
+#    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Disabled    None
+
+# Not automated
+# UTC034.201 USB Type-C PD current limiting (Ubuntu) (ME: Disabled)
+#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
+#    ...    power supply does not exceed the limits of the power supply's
+#    ...    specifications.
+#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC034.201 not supported
+#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC034.201 not supported
+#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Disabled    None
+
+# Not automated
+# UTC008.202 USB Type-C Display output (Fedora) (ME: Disabled)
+#    [Documentation]    Check whether a display connected to the USB Type-C port
+#    ...    is recognized by the OPERATING_SYSTEM.
+#    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC008.202 not supported
+#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC008.202 not supported
+#    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Disabled    None
+
+# Not automated
+# UTC034.202 USB Type-C PD current limiting (Fedora) (ME: Disabled)
+#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
+#    ...    power supply does not exceed the limits of the power supply's
+#    ...    specifications.
+#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC034.202 not supported
+#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Disabled    None
+
+# Not automated
+# UTC034.301 USB Type-C PD current limiting (Windows) (ME: Disabled)
+#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
+#    ...    power supply does not exceed the limits of the power supply's
+#    ...    specifications.
+#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC034.301 not supported
+#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Disabled    None
 
 # Not automated
 # UTC115.001 USB Type-C docking station USB devices recognition (Firmware) (ME: Enabled) (WL-UMD05 Pro Rev.E)
@@ -58,13 +154,6 @@ Suite Teardown      Run Keyword
 #    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC105.201 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.E
 
-UTC107.201 USB Type-C Display output (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.E)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC107.201 not supported
-    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC107.201 not supported
-    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC107.201 not supported
-    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.E
-
 UTC109.201 USB Type-C docking station HDMI display (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -171,15 +260,6 @@ UTC131.201 USB Type-C docking station SD Card read/write (Ubuntu) (ME: Enabled)
     Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC131.201 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.E
 
-# Not automated
-# UTC133.201 USB Type-C PD current limiting (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC133.201 not supported
-#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC133.201 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.E
-
 UTC135.201 Docking station detection after coldboot (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -306,12 +386,6 @@ UTC157.201 Docking station detection after suspend then hotplug (S3) (Ubuntu) (M
 #    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC105.202 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.E
 
-UTC107.202 USB Type-C Display output (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.E)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC107.202 not supported
-    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC107.202 not supported
-    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.E
-
 UTC109.202 USB Type-C docking station HDMI display (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -406,14 +480,6 @@ UTC131.202 USB Type-C docking station SD Card read/write (Fedora) (ME: Enabled)
     Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC131.202 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.E
 
-# Not automated
-# UTC133.202 USB Type-C PD current limiting (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC133.202 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.E
-
 UTC135.202 Docking station detection after coldboot (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -614,26 +680,6 @@ UTC131.301 USB Type-C docking station SD Card read/write (Windows) (ME: Enabled)
     Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC131.301 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_WINDOWS}    Enabled    WL-UMD05 Pro Rev.E
 
-# Not automated
-# UTC133.301 USB Type-C PD current limiting (Windows) (ME: Enabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC133.301 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Enabled    WL-UMD05 Pro Rev.E
-
-# Not automated
-# UTC102.001 USB Type-A charging capability (Firmware) (ME: Disabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test verifies that the USB-A ports are able to provide
-#    ...    charging to a connected smartphone.
-#    Usb Type-A Charging Capability    001    Disabled    WL-UMD05 Pro Rev.E
-
-# Not automated
-# UTC104.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Disabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test verifies that the Thunderbolt 4 port is able
-#    ...    to provide charging to a USB Type-C accessory.
-#    Thunderbolt 4 Usb Type-C Power Output    001    Disabled    WL-UMD05 Pro Rev.E
-
 # Not automated
 # UTC116.001 USB Type-C docking station USB devices recognition (Firmware) (ME: Disabled) (WL-UMD05 Pro Rev.E)
 #    [Documentation]    Check whether the external USB devices connected to the
@@ -659,13 +705,6 @@ UTC131.301 USB Type-C docking station SD Card read/write (Windows) (ME: Enabled)
 #    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC106.201 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.E
 
-UTC108.201 USB Type-C Display output (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.E)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC108.201 not supported
-    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC108.201 not supported
-    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC108.201 not supported
-    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.E
-
 UTC110.201 USB Type-C docking station HDMI display (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -772,15 +811,6 @@ UTC132.201 USB Type-C docking station SD Card read/write (Ubuntu) (ME: Disabled)
     Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC132.201 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.E
 
-# Not automated
-# UTC134.201 USB Type-C PD current limiting (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC134.201 not supported
-#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC134.201 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.E
-
 UTC136.201 Docking station detection after coldboot (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -907,12 +937,6 @@ UTC158.201 Docking station detection after suspend then hotplug (S3) (Ubuntu) (M
 #    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC106.202 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.E
 
-UTC108.202 USB Type-C Display output (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.E)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC108.202 not supported
-    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC108.202 not supported
-    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.E
-
 UTC110.202 USB Type-C docking station HDMI display (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -1007,14 +1031,6 @@ UTC132.202 USB Type-C docking station SD Card read/write (Fedora) (ME: Disabled)
     Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC132.202 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.E
 
-# Not automated
-# UTC134.202 USB Type-C PD current limiting (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC134.202 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.E
-
 UTC136.202 Docking station detection after coldboot (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.E)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -1215,26 +1231,6 @@ UTC132.301 USB Type-C docking station SD Card read/write (Windows) (ME: Disabled
     Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC132.301 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_WINDOWS}    Disabled    WL-UMD05 Pro Rev.E
 
-# Not automated
-# UTC134.301 USB Type-C PD current limiting (Windows) (ME: Disabled) (WL-UMD05 Pro Rev.E)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC134.301 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Disabled    WL-UMD05 Pro Rev.E
-
-# Not automated
-# UTC201.001 USB Type-A charging capability (Firmware) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test verifies that the USB-A ports are able to provide
-#    ...    charging to a connected smartphone.
-#    Usb Type-A Charging Capability    001    Enabled    WL-UMD05 Pro Rev.C1
-
-# Not automated
-# UTC203.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test verifies that the Thunderbolt 4 port is able
-#    ...    to provide charging to a USB Type-C accessory.
-#    Thunderbolt 4 Usb Type-C Power Output    001    Enabled    WL-UMD05 Pro Rev.C1
-
 # Not automated
 # UTC215.001 USB Type-C docking station USB devices recognition (Firmware) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
 #    [Documentation]    Check whether the external USB devices connected to the
@@ -1260,13 +1256,6 @@ UTC132.301 USB Type-C docking station SD Card read/write (Windows) (ME: Disabled
 #    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC205.201 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.C1
 
-UTC207.201 USB Type-C Display output (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC207.201 not supported
-    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC207.201 not supported
-    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC207.201 not supported
-    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.C1
-
 UTC209.201 USB Type-C docking station HDMI display (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -1373,15 +1362,6 @@ UTC231.201 USB Type-C docking station SD Card read/write (Ubuntu) (ME: Enabled)
     Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC231.201 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.C1
 
-# Not automated
-# UTC233.201 USB Type-C PD current limiting (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC233.201 not supported
-#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC233.201 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Enabled    WL-UMD05 Pro Rev.C1
-
 UTC235.201 Docking station detection after coldboot (Ubuntu) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -1508,12 +1488,6 @@ UTC257.201 Docking station detection after suspend then hotplug (S3) (Ubuntu) (M
 #    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC205.202 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.C1
 
-UTC207.202 USB Type-C Display output (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC207.202 not supported
-    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC207.202 not supported
-    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.C1
-
 UTC209.202 USB Type-C docking station HDMI display (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -1608,14 +1582,6 @@ UTC231.202 USB Type-C docking station SD Card read/write (Fedora) (ME: Enabled)
     Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC231.202 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.C1
 
-# Not automated
-# UTC233.202 USB Type-C PD current limiting (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC233.202 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Enabled    WL-UMD05 Pro Rev.C1
-
 UTC235.202 Docking station detection after coldboot (Fedora) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -1816,26 +1782,6 @@ UTC231.301 USB Type-C docking station SD Card read/write (Windows) (ME: Enabled)
     Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC231.301 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_WINDOWS}    Enabled    WL-UMD05 Pro Rev.C1
 
-# Not automated
-# UTC233.301 USB Type-C PD current limiting (Windows) (ME: Enabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC233.301 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Enabled    WL-UMD05 Pro Rev.C1
-
-# Not automated
-# UTC202.001 USB Type-A charging capability (Firmware) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test verifies that the USB-A ports are able to provide
-#    ...    charging to a connected smartphone.
-#    Usb Type-A Charging Capability    001    Disabled    WL-UMD05 Pro Rev.C1
-
-# Not automated
-# UTC204.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test verifies that the Thunderbolt 4 port is able
-#    ...    to provide charging to a USB Type-C accessory.
-#    Thunderbolt 4 Usb Type-C Power Output    001    Disabled    WL-UMD05 Pro Rev.C1
-
 # Not automated
 # UTC216.001 USB Type-C docking station USB devices recognition (Firmware) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
 #    [Documentation]    Check whether the external USB devices connected to the
@@ -1861,13 +1807,6 @@ UTC231.301 USB Type-C docking station SD Card read/write (Windows) (ME: Enabled)
 #    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC206.201 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.C1
 
-UTC208.201 USB Type-C Display output (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC208.201 not supported
-    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC208.201 not supported
-    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC208.201 not supported
-    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.C1
-
 UTC210.201 USB Type-C docking station HDMI display (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -1974,15 +1913,6 @@ UTC232.201 USB Type-C docking station SD Card read/write (Ubuntu) (ME: Disabled)
     Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC232.201 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.C1
 
-# Not automated
-# UTC234.201 USB Type-C PD current limiting (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC234.201 not supported
-#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC234.201 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Disabled    WL-UMD05 Pro Rev.C1
-
 UTC236.201 Docking station detection after coldboot (Ubuntu) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -2109,12 +2039,6 @@ UTC258.201 Docking station detection after suspend then hotplug (S3) (Ubuntu) (M
 #    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC206.202 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.C1
 
-UTC208.202 USB Type-C Display output (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC208.202 not supported
-    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC208.202 not supported
-    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.C1
-
 UTC210.202 USB Type-C docking station HDMI display (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -2209,14 +2133,6 @@ UTC232.202 USB Type-C docking station SD Card read/write (Fedora) (ME: Disabled)
     Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC232.202 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.C1
 
-# Not automated
-# UTC234.202 USB Type-C PD current limiting (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC234.202 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Disabled    WL-UMD05 Pro Rev.C1
-
 UTC236.202 Docking station detection after coldboot (Fedora) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -2417,26 +2333,6 @@ UTC232.301 USB Type-C docking station SD Card read/write (Windows) (ME: Disabled
     Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC232.301 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_WINDOWS}    Disabled    WL-UMD05 Pro Rev.C1
 
-# Not automated
-# UTC234.301 USB Type-C PD current limiting (Windows) (ME: Disabled) (WL-UMD05 Pro Rev.C1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC234.301 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Disabled    WL-UMD05 Pro Rev.C1
-
-# Not automated
-# UTC301.001 USB Type-A charging capability (Firmware) (ME: Enabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test verifies that the USB-A ports are able to provide
-#    ...    charging to a connected smartphone.
-#    Usb Type-A Charging Capability    001    Enabled    WL-UG69PD2 Rev.A1
-
-# Not automated
-# UTC303.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Enabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test verifies that the Thunderbolt 4 port is able
-#    ...    to provide charging to a USB Type-C accessory.
-#    Thunderbolt 4 Usb Type-C Power Output    001    Enabled    WL-UG69PD2 Rev.A1
-
 # Not automated
 # UTC315.001 USB Type-C docking station USB devices recognition (Firmware) (ME: Enabled) (WL-UG69PD2 Rev.A1)
 #    [Documentation]    Check whether the external USB devices connected to the
@@ -2462,13 +2358,6 @@ UTC232.301 USB Type-C docking station SD Card read/write (Windows) (ME: Disabled
 #    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC305.201 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_UBUNTU}    Enabled    WL-UG69PD2 Rev.A1
 
-UTC307.201 USB Type-C Display output (Ubuntu) (ME: Enabled) (WL-UG69PD2 Rev.A1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC307.201 not supported
-    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC307.201 not supported
-    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC307.201 not supported
-    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Enabled    WL-UG69PD2 Rev.A1
-
 UTC309.201 USB Type-C docking station HDMI display (Ubuntu) (ME: Enabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -2575,15 +2464,6 @@ UTC331.201 USB Type-C docking station SD Card read/write (Ubuntu) (ME: Enabled)
     Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC331.201 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_UBUNTU}    Enabled    WL-UG69PD2 Rev.A1
 
-# Not automated
-# UTC333.201 USB Type-C PD current limiting (Ubuntu) (ME: Enabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC333.201 not supported
-#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC333.201 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Enabled    WL-UG69PD2 Rev.A1
-
 UTC335.201 Docking station detection after coldboot (Ubuntu) (ME: Enabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -2710,12 +2590,6 @@ UTC357.201 Docking station detection after suspend then hotplug (S3) (Ubuntu) (M
 #    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC305.202 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_FEDORA}    Enabled    WL-UG69PD2 Rev.A1
 
-UTC307.202 USB Type-C Display output (Fedora) (ME: Enabled) (WL-UG69PD2 Rev.A1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC307.202 not supported
-    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC307.202 not supported
-    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Enabled    WL-UG69PD2 Rev.A1
-
 UTC309.202 USB Type-C docking station HDMI display (Fedora) (ME: Enabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -2810,14 +2684,6 @@ UTC331.202 USB Type-C docking station SD Card read/write (Fedora) (ME: Enabled)
     Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC331.202 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_FEDORA}    Enabled    WL-UG69PD2 Rev.A1
 
-# Not automated
-# UTC333.202 USB Type-C PD current limiting (Fedora) (ME: Enabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC333.202 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Enabled    WL-UG69PD2 Rev.A1
-
 UTC335.202 Docking station detection after coldboot (Fedora) (ME: Enabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -3018,26 +2884,6 @@ UTC331.301 USB Type-C docking station SD Card read/write (Windows) (ME: Enabled)
     Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC331.301 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_WINDOWS}    Enabled    WL-UG69PD2 Rev.A1
 
-# Not automated
-# UTC333.301 USB Type-C PD current limiting (Windows) (ME: Enabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC333.301 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Enabled    WL-UG69PD2 Rev.A1
-
-# Not automated
-# UTC302.001 USB Type-A charging capability (Firmware) (ME: Disabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test verifies that the USB-A ports are able to provide
-#    ...    charging to a connected smartphone.
-#    Usb Type-A Charging Capability    001    Disabled    WL-UG69PD2 Rev.A1
-
-# Not automated
-# UTC304.001 Thunderbolt 4 USB Type-C power output (Firmware) (ME: Disabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test verifies that the Thunderbolt 4 port is able
-#    ...    to provide charging to a USB Type-C accessory.
-#    Thunderbolt 4 Usb Type-C Power Output    001    Disabled    WL-UG69PD2 Rev.A1
-
 # Not automated
 # UTC316.001 USB Type-C docking station USB devices recognition (Firmware) (ME: Disabled) (WL-UG69PD2 Rev.A1)
 #    [Documentation]    Check whether the external USB devices connected to the
@@ -3063,13 +2909,6 @@ UTC331.301 USB Type-C docking station SD Card read/write (Windows) (ME: Enabled)
 #    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC306.201 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_UBUNTU}    Disabled    WL-UG69PD2 Rev.A1
 
-UTC308.201 USB Type-C Display output (Ubuntu) (ME: Disabled) (WL-UG69PD2 Rev.A1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC308.201 not supported
-    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC308.201 not supported
-    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC308.201 not supported
-    Usb Type-C Display Output    ${ENV_ID_UBUNTU}    Disabled    WL-UG69PD2 Rev.A1
-
 UTC310.201 USB Type-C docking station HDMI display (Ubuntu) (ME: Disabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -3176,15 +3015,6 @@ UTC332.201 USB Type-C docking station SD Card read/write (Ubuntu) (ME: Disabled)
     Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC332.201 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_UBUNTU}    Disabled    WL-UG69PD2 Rev.A1
 
-# Not automated
-# UTC334.201 USB Type-C PD current limiting (Ubuntu) (ME: Disabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_UBUNTU_SUPPORT}    UTC334.201 not supported
-#    Skip If    '${ENV_ID_UBUNTU}' not in ${TESTED_LINUX_DISTROS}    UTC334.201 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_UBUNTU}    Disabled    WL-UG69PD2 Rev.A1
-
 UTC336.201 Docking station detection after coldboot (Ubuntu) (ME: Disabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -3311,12 +3141,6 @@ UTC358.201 Docking station detection after suspend then hotplug (S3) (Ubuntu) (M
 #    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC306.202 not supported
 #    Usb Type-C Pd Power Input    ${ENV_ID_FEDORA}    Disabled    WL-UG69PD2 Rev.A1
 
-UTC308.202 USB Type-C Display output (Fedora) (ME: Disabled) (WL-UG69PD2 Rev.A1)
-    [Documentation]    Check whether the DUT can detect the USB Type-C hub.
-    Skip If    not ${USB_TYPE_C_DISPLAY_SUPPORT}    UTC308.202 not supported
-    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC308.202 not supported
-    Usb Type-C Display Output    ${ENV_ID_FEDORA}    Disabled    WL-UG69PD2 Rev.A1
-
 UTC310.202 USB Type-C docking station HDMI display (Fedora) (ME: Disabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    This test aims to verify that the display connected with
     ...    the HDMI cable to the docking station is correctly
@@ -3411,14 +3235,6 @@ UTC332.202 USB Type-C docking station SD Card read/write (Fedora) (ME: Disabled)
     Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC332.202 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_FEDORA}    Disabled    WL-UG69PD2 Rev.A1
 
-# Not automated
-# UTC334.202 USB Type-C PD current limiting (Fedora) (ME: Disabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    '${ENV_ID_FEDORA}' not in ${TESTED_LINUX_DISTROS}    UTC334.202 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_FEDORA}    Disabled    WL-UG69PD2 Rev.A1
-
 UTC336.202 Docking station detection after coldboot (Fedora) (ME: Disabled) (WL-UG69PD2 Rev.A1)
     [Documentation]    Check whether he DUT properly detects the docking station
     ...    after coldboot.
@@ -3618,11 +3434,3 @@ UTC332.301 USB Type-C docking station SD Card read/write (Windows) (ME: Disabled
     Skip If    not ${DOCKING_STATION_SD_CARD_READER_SUPPORT}    UTC332.301 not supported
     Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC332.301 not supported
     Usb Type-C Docking Station Sd Card Read/Write    ${ENV_ID_WINDOWS}    Disabled    WL-UG69PD2 Rev.A1
-
-# Not automated
-# UTC334.301 USB Type-C PD current limiting (Windows) (ME: Disabled) (WL-UG69PD2 Rev.A1)
-#    [Documentation]    This test aims to verify that the power draw from a USB-C PD
-#    ...    power supply does not exceed the limits of the power supply's
-#    ...    specifications.
-#    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    UTC334.301 not supported
-#    Usb Type-C Pd Current Limiting    ${ENV_ID_WINDOWS}    Disabled    WL-UG69PD2 Rev.A1

From 838b07af1a61428d3702a685feedf6eb0509179a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Go=C5=82a=C5=9B?= <filip.golas@3mdeb.com>
Date: Mon, 9 Jun 2025 08:31:09 +0200
Subject: [PATCH 3/3] lib/utc.robot: Remove invalid USB Type-C Display Output
 impl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Filip Gołaś <filip.golas@3mdeb.com>
---
 lib/utc.robot | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/lib/utc.robot b/lib/utc.robot
index 82444eafad..1458bbb71d 100644
--- a/lib/utc.robot
+++ b/lib/utc.robot
@@ -26,6 +26,7 @@ Prepare UTC Test Suite
 
 Ensure ME State
     [Arguments]    ${me_state}
+    IF    '${me_state}' == 'None'    RETURN
     IF    '${me_state}' != '${UTC_CURRENT_ME_STATE}'
         IF    '${me_state}' == 'Enabled'
             Set UEFI Option    MeMode    Enabled
@@ -66,20 +67,25 @@ Usb Type-C Pd Power Input
         Fail    Not implemented on ENV_ID ${env_id}
     END
 
-Usb Type-C Display Output
-    [Arguments]    ${env_id}    ${me_state}    ${dock_name}
-    Ensure ME State    ${me_state}
-    Power On
-    IF    '${env_id}'.startswith('2')    # Linux
-        Boot System Or From Connected Disk    ${env_id}
-        Login To Linux
-        Switch To Root User
-        ${out}=    List Devices In Linux    usb
-        Should Contain    ${out}    ${CLEVO_USB_C_HUB}
-        Exit From Root User
-    ELSE
-        Fail    Not implemented on ENV_ID ${env_id}
-    END
+# Invalid implementation. Should check if a USB-C display is
+# connected, not if a docking stations is connected.
+# The display should be connected directly to the device,
+# not through a docking station.
+#
+# Usb Type-C Display Output
+#    [Arguments]    ${env_id}    ${me_state}    ${dock_name}
+#    Ensure ME State    ${me_state}
+#    Power On
+#    IF    '${env_id}'.startswith('2')    # Linux
+#    Boot System Or From Connected Disk    ${env_id}
+#    Login To Linux
+#    Switch To Root User
+#    ${out}=    List Devices In Linux    usb
+#    Should Contain    ${out}    ${CLEVO_USB_C_HUB}
+#    Exit From Root User
+#    ELSE
+#    Fail    Not implemented on ENV_ID ${env_id}
+#    END
 
 Usb Type-C Docking Station Hdmi Display
     [Arguments]    ${env_id}    ${me_state}    ${dock_name}