ci: rename wifi_two_dut to two_duts

components/esp_driver_tsens/test_apps/temperature_sensor/pytest_temperature_sensor.py

@@ -38,9 +38,9 @@ def test_temperature_sensor_cbs(dut: Dut) -> None:
 @pytest.mark.esp32s3
 @pytest.mark.esp32c2
 @pytest.mark.esp32c6
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize('count', [2], indirect=True)
 def test_temperature_phy_cases(case_tester: CaseTester) -> None:  # type: ignore
     for case in case_tester.test_menu:
-        if case.attributes.get('test_env', 'wifi_two_dut') == 'wifi_two_dut':
+        if case.attributes.get('test_env', 'two_duts') == 'two_duts':
             case_tester.run_all_multi_dev_cases(case=case, reset=True)

components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py

@@ -11,14 +11,14 @@ from pytest_embedded_idf.unity_tester import CaseTester
 @pytest.mark.esp32c5
 @pytest.mark.esp32c6
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize('count', [2], indirect=True)
 def test_wifi_connect_cases(case_tester: CaseTester) -> None:  # type: ignore
     case_tester.run_all_cases()
 
 
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, config, baud',
@@ -32,7 +32,7 @@ def test_wifi_connect_cases_esp32c2_xtal26m(case_tester: CaseTester) -> None:
 
 
 @pytest.mark.esp32c2eco4
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, config, target, baud',
@@ -45,7 +45,7 @@ def test_wifi_connect_cases_esp32c2eco4_xtal26m(case_tester: CaseTester) -> None
     case_tester.run_all_cases()
 
 
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.esp32c3eco7
 @pytest.mark.parametrize(
     'count, config, target',

components/wpa_supplicant/test_apps/main/test_offchannel.c

@@ -264,4 +264,4 @@ static void test_wifi_roc(void)
     }
 }
 
-TEST_CASE_MULTIPLE_DEVICES("test ROC and Offchannel Action Frame Tx", "[Offchan][test_env=wifi_two_dut][timeout=90]", test_wifi_roc, test_wifi_offchan_tx);
+TEST_CASE_MULTIPLE_DEVICES("test ROC and Offchannel Action Frame Tx", "[Offchan][test_env=two_duts][timeout=90]", test_wifi_roc, test_wifi_offchan_tx);

components/wpa_supplicant/test_apps/pytest_wpa_supplicant_ut.py

@@ -25,7 +25,7 @@ def test_wpa_supplicant_ut(dut: Dut) -> None:
 @pytest.mark.esp32c5
 @pytest.mark.esp32c6
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count',
     [
@@ -35,11 +35,11 @@ def test_wpa_supplicant_ut(dut: Dut) -> None:
 )
 def test_wpa_supplicant_ut_offchan(case_tester: CaseTester) -> None:
     for case in case_tester.test_menu:
-        if case.attributes.get('test_env') == 'wifi_two_dut':
+        if case.attributes.get('test_env') == 'two_duts':
             case_tester.run_multi_dev_case(case=case, reset=True)
 
 
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.esp32c2eco4
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
@@ -56,11 +56,11 @@ def test_wpa_supplicant_ut_offchan(case_tester: CaseTester) -> None:
 )
 def test_wpa_supplicant_esp32c2eco4_xtal26mhz(case_tester: CaseTester) -> None:
     for case in case_tester.test_menu:
-        if case.attributes.get('test_env') == 'wifi_two_dut':
+        if case.attributes.get('test_env') == 'two_duts':
             case_tester.run_multi_dev_case(case=case, reset=True)
 
 
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.esp32c3eco7
 @pytest.mark.parametrize(
     'count, config, target',
@@ -75,5 +75,5 @@ def test_wpa_supplicant_esp32c2eco4_xtal26mhz(case_tester: CaseTester) -> None:
 )
 def test_wpa_supplicant_esp32c3eco7(case_tester: CaseTester) -> None:
     for case in case_tester.test_menu:
-        if case.attributes.get('test_env') == 'wifi_two_dut':
+        if case.attributes.get('test_env') == 'two_duts':
             case_tester.run_multi_dev_case(case=case, reset=True)

examples/bluetooth/bluedroid/ble/ble_throughput/pytest_ble_throughput_test.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import os.path
 import time
@@ -16,7 +16,7 @@ from pytest_embedded_idf.dut import IdfDut
 @pytest.mark.esp32c5
 @pytest.mark.esp32h2
 @pytest.mark.esp32s3
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, config, erase_all', [
         (2,
@@ -50,7 +50,7 @@ def test_gatt_write_throughput(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> Non
 
 # Case 2: gatt write throughput test for ESP32C2 26mhz xtal
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, target, baud, app_path, config, erase_all', [
@@ -91,7 +91,7 @@ def test_c2_26mhz_xtal_write_throughput(app_path: str, dut: Tuple[IdfDut, IdfDut
 @pytest.mark.esp32c5
 @pytest.mark.esp32h2
 @pytest.mark.esp32s3
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, config, erase_all', [
         (2,
@@ -127,7 +127,7 @@ def test_gatt_notify_throughput(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> No
 
 # Case 4: gatt notify throughput test for ESP32C2 26mhz xtal
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, target, baud, app_path, config, erase_all', [

examples/bluetooth/bluedroid/ble/pytest_ble_test.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import os.path
 from typing import Tuple
@@ -16,7 +16,7 @@ from pytest_embedded_idf.dut import IdfDut
 @pytest.mark.esp32h2
 @pytest.mark.esp32s3
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, config, erase_all', [
         (2,
@@ -54,7 +54,7 @@ def test_gatt_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 2: gatt client and gatt server test for ESP32C2 26mhz xtal
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, target, baud, app_path, config, erase_all', [
@@ -99,7 +99,7 @@ def test_c2_26mhz_xtal_gatt_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> N
 @pytest.mark.esp32h2
 @pytest.mark.esp32s3
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, config, erase_all', [
         (2,
@@ -154,7 +154,7 @@ def test_gatt_security_func(app_path: str, dut: Tuple[IdfDut, IdfDut], target: T
 
 # Case 4: gatt security server and gatt security client test for ESP32C2 26mhz xtal
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, target, baud, app_path, config, erase_all', [
@@ -210,7 +210,7 @@ def test_c2_26mhz_xtal_gatt_security_func(app_path: str, dut: Tuple[IdfDut, IdfD
 @pytest.mark.esp32h2
 @pytest.mark.esp32s3
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, config, erase_all', [
         (2,
@@ -238,7 +238,7 @@ def test_ble_ibeacon_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 5: ble ibeacon test for ESP32C2 26mhz xtal
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, target, baud, app_path, config, erase_all', [

examples/bluetooth/bluedroid/ble_50/pytest_ble50_test.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import os.path
 from typing import Tuple
@@ -14,7 +14,7 @@ from pytest_embedded_idf.dut import IdfDut
 @pytest.mark.esp32h2
 @pytest.mark.esp32s3
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, config, erase_all', [
         (2,
@@ -47,7 +47,7 @@ def test_ble50_security_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 2: ble50 security client and ble50 security server test for ESP32C2 26mhz xtal
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, target, baud, app_path, config, erase_all', [
@@ -86,7 +86,7 @@ def test_c2_26mhz_xtal_ble50_security_func(app_path: str, dut: Tuple[IdfDut, Idf
 @pytest.mark.esp32h2
 @pytest.mark.esp32s3
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, config, erase_all', [
         (2,
@@ -115,7 +115,7 @@ def test_period_adv_sync_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None
 
 # Case 4: period_adv and period_sync test for ESP32C2 26mhz xtal
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, target, baud, app_path, config, erase_all', [

examples/bluetooth/bluedroid/classic_bt/pytest_classic_bt_test.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 import os.path
 from typing import Tuple
@@ -10,7 +10,7 @@ from pytest_embedded_idf.dut import IdfDut
 
 # Case 1: SPP
 @pytest.mark.esp32
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, target, erase_all, config', [
         (2,
@@ -40,7 +40,7 @@ def test_bt_spp_only(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 2: SPP_VFS
 @pytest.mark.esp32
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, target, config', [
         (2,
@@ -65,7 +65,7 @@ def test_bt_spp_vfs(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 3: A2DP
 @pytest.mark.esp32
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, target, config', [
         (2,
@@ -88,7 +88,7 @@ def test_bt_a2dp(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 4: HFP
 @pytest.mark.esp32
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, target, config', [
         (2,
@@ -110,7 +110,7 @@ def test_bt_hfp(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # # Case 5: HID
 @pytest.mark.esp32
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, target, config', [
         (2,
@@ -136,7 +136,7 @@ def test_bt_hid(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 6: L2CAP
 @pytest.mark.esp32
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path, target, config', [
         (2,

examples/bluetooth/nimble/pytest_nimble_test.py

@@ -16,7 +16,7 @@ from pytest_embedded_idf.dut import IdfDut
 @pytest.mark.esp32c5
 @pytest.mark.esp32c61
 @pytest.mark.esp32
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path', [
         (2,
@@ -40,7 +40,7 @@ def test_power_save_conn(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None:
 
 # Case 2: BLE power save test for ESP32C2
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'config, count, app_path, baud', [
@@ -65,7 +65,7 @@ def test_power_save_conn_esp32c2_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None:
 
 
 # Case 2: BLE power save test for ESP32C2ECO4
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.esp32c2eco4
 @pytest.mark.parametrize(
@@ -96,7 +96,7 @@ def test_power_save_conn_esp32c2eco4(dut: Tuple[IdfDut, IdfDut]) -> None:
 
 
 # Case 2: BLE power save test for ESP32C3ECO7
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.esp32c3eco7
 @pytest.mark.parametrize(
     'config, count, target, app_path',

examples/wifi/getting_started/pytest_wifi_getting_started.py

@@ -27,7 +27,7 @@ from pytest_embedded_idf.dut import IdfDut
 @pytest.mark.esp32c5
 @pytest.mark.esp32c6
 @pytest.mark.esp32c61
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize(
     'count, app_path', [
         (2,
@@ -50,7 +50,7 @@ def test_wifi_getting_started(dut: Tuple[IdfDut, IdfDut]) -> None:
 
 
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, config, baud, app_path', [
@@ -74,7 +74,7 @@ def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) ->
     softap.expect('station .+ join, AID=', timeout=60)
 
 
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.esp32c2eco4
 @pytest.mark.parametrize(
@@ -106,7 +106,7 @@ def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: Tuple[IdfDut, IdfDut])
     softap.expect('station .+ join, AID=', timeout=60)
 
 
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.esp32c3eco7
 @pytest.mark.parametrize(
     'count, config, target, app_path',

tools/ci/dynamic_pipelines/templates/known_generate_test_child_pipeline_warnings.yml

@@ -23,7 +23,7 @@ no_runner_tags:
   - esp32c5,wifi_ap
   - esp32c5,wifi_router
   - esp32c5_2,generic_multi_device
-  - esp32c5_2,wifi_two_dut
+  - esp32c5_2,two_duts
   - esp32c6,jtag
   - esp32c61,generic
   - esp32c61,jtag

tools/ci/idf_pytest/constants.py

@@ -116,7 +116,7 @@ ENV_MARKERS = {
     'openthread_bbr': 'tests should be used for openthread border router linked to Internet.',
     'openthread_sleep': 'tests should be used for openthread sleepy device.',
     'zigbee_multi_dut': 'zigbee runner which have multiple duts.',
-    'wifi_two_dut': 'tests should be run on runners which has two wifi duts connected.',
+    'two_duts': 'tests should be run on runners which has two wifi duts connected.',
     'generic_multi_device': 'generic multiple devices whose corresponding gpio pins are connected to each other.',
     'twai_network': 'multiple runners form a TWAI network.',
     'sdio_master_slave': 'Test sdio multi board, esp32+esp32',

tools/test_apps/phy/phy_tsens/pytest_phy_tsens.py

@@ -148,7 +148,7 @@ def run_phy_tsens_test_with_light_sleep(dut: Tuple[Dut, Dut]) -> None:
 @pytest.mark.esp32c5
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.parametrize('count', [2], indirect=True)
 def test_phy_tsens_coexist(dut: Tuple[Dut, Dut]) -> None:
     for _dut in dut:
@@ -167,7 +167,7 @@ def test_phy_tsens_coexist(dut: Tuple[Dut, Dut]) -> None:
 
 
 @pytest.mark.esp32c2
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.parametrize(
     'count, config, baud',
@@ -192,7 +192,7 @@ def test_phy_tsens_coexist_c2_xtal26m(dut: Tuple[Dut, Dut]) -> None:
     run_phy_tsens_test_with_light_sleep(dut)
 
 
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.xtal_26mhz
 @pytest.mark.esp32c2eco4
 @pytest.mark.parametrize(
@@ -218,7 +218,7 @@ def test_phy_tsens_coexist_c2eco4_xtal26m(dut: Tuple[Dut, Dut]) -> None:
     run_phy_tsens_test_with_light_sleep(dut)
 
 
-@pytest.mark.wifi_two_dut
+@pytest.mark.two_duts
 @pytest.mark.esp32c3eco7
 @pytest.mark.parametrize(
     'count, config, target',