From 4021602678de73dc295732a48798b8df120ea261 Mon Sep 17 00:00:00 2001 From: Chen Yudong Date: Fri, 5 Dec 2025 10:35:54 +0800 Subject: [PATCH] ci: rename wifi_two_dut to two_duts --- .gitlab/ci/target-test.yml | 48 +++++++++---------- .../wifi_connect/pytest_wifi_connect.py | 8 ++-- conftest.py | 4 +- .../classic_bt/pytest_classic_bt_test.py | 14 +++--- .../bluetooth/nimble/pytest_nimble_test.py | 8 ++-- .../pytest_wifi_getting_started.py | 8 ++-- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 55e2b911e4..919b1ee770 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -424,53 +424,53 @@ pytest_examples_esp32_flash_encryption: - build_pytest_examples_esp32 tags: [ esp32, flash_encryption ] -pytest_examples_esp32_wifi_two_dut: +pytest_examples_esp32_two_duts: extends: - .pytest_examples_dir_template - .rules:test:example_test-esp32-wifi needs: - build_pytest_examples_esp32 - tags: [ esp32, wifi_two_dut ] + tags: [ esp32, two_duts ] -pytest_examples_esp32c3_wifi_two_dut: +pytest_examples_esp32c3_two_duts: extends: - .pytest_examples_dir_template - .rules:test:example_test-esp32c3-wifi needs: - build_pytest_examples_esp32c3 - tags: [ esp32c3, wifi_two_dut ] + tags: [ esp32c3, two_duts ] -pytest_examples_esp32s3_wifi_two_dut: +pytest_examples_esp32s3_two_duts: extends: - .pytest_examples_dir_template - .rules:test:example_test-esp32s3-wifi needs: - build_pytest_examples_esp32s3 - tags: [ esp32s3, wifi_two_dut ] + tags: [ esp32s3, two_duts ] -pytest_examples_esp32c2_wifi_two_dut: +pytest_examples_esp32c2_two_duts: extends: - .pytest_examples_dir_template - .rules:test:example_test-esp32c2-wifi needs: - build_pytest_examples_esp32c2 - tags: [ esp32c2, wifi_two_dut, xtal_26mhz ] + tags: [ esp32c2, two_duts, xtal_26mhz ] -pytest_examples_esp32c2eco4_wifi_two_dut: +pytest_examples_esp32c2eco4_two_duts: extends: - .pytest_examples_dir_template - .rules:test:example_test-esp32c2-wifi needs: - build_pytest_examples_esp32c2 - tags: [wifi_two_dut_eco, xtal_26mhz, esp32c2] + tags: [two_duts_eco, xtal_26mhz, esp32c2] -pytest_examples_esp32c3eco7_wifi_two_dut: +pytest_examples_esp32c3eco7_two_duts: extends: - .pytest_examples_dir_template - .rules:test:example_test-esp32c3-wifi needs: - build_pytest_examples_esp32c3 - tags: [ wifi_two_dut_eco , esp32c3] + tags: [ two_duts_eco , esp32c3] pytest_examples_esp32c3_flash_encryption: extends: @@ -614,13 +614,13 @@ pytest_components_esp32_generic_multi_device: - build_pytest_components_esp32 tags: [ esp32, generic_multi_device ] -pytest_components_esp32_wifi_two_dut: +pytest_components_esp32_two_duts: extends: - .pytest_components_dir_template - .rules:test:component_ut-esp32-wifi needs: - build_pytest_components_esp32 - tags: [ esp32, wifi_two_dut ] + tags: [ esp32, two_duts ] pytest_components_esp32_adc: extends: @@ -922,45 +922,45 @@ pytest_components_esp32c3_generic_multi_device: - build_pytest_components_esp32c3 tags: [ esp32c3, generic_multi_device ] -pytest_components_esp32c3_wifi_two_dut: +pytest_components_esp32c3_two_duts: extends: - .pytest_components_dir_template - .rules:test:component_ut-esp32c3-wifi needs: - build_pytest_components_esp32c3 - tags: [ esp32c3, wifi_two_dut ] + tags: [ esp32c3, two_duts ] -pytest_components_esp32s3_wifi_two_dut: +pytest_components_esp32s3_two_duts: extends: - .pytest_components_dir_template - .rules:test:component_ut-esp32s3-wifi needs: - build_pytest_components_esp32s3 - tags: [ esp32s3, wifi_two_dut ] + tags: [ esp32s3, two_duts ] -pytest_components_esp32c2_wifi_two_dut: +pytest_components_esp32c2_two_duts: extends: - .pytest_components_dir_template - .rules:test:component_ut-esp32c2-wifi needs: - build_pytest_components_esp32c2 - tags: [ esp32c2, wifi_two_dut, xtal_26mhz ] + tags: [ esp32c2, two_duts, xtal_26mhz ] -pytest_components_esp32c3eco7_wifi_two_dut: +pytest_components_esp32c3eco7_two_duts: extends: - .pytest_components_dir_template - .rules:test:component_ut-esp32c3-wifi needs: - build_pytest_components_esp32c3 - tags: [ wifi_two_dut_eco , esp32c3] + tags: [ two_duts_eco , esp32c3] -pytest_components_esp32c2eco4_wifi_two_dut: +pytest_components_esp32c2eco4_two_duts: extends: - .pytest_components_dir_template - .rules:test:component_ut-esp32c2-wifi needs: - build_pytest_components_esp32c2 - tags: [ wifi_two_dut_eco, xtal_26mhz, esp32c2] + tags: [ two_duts_eco, xtal_26mhz, esp32c2] pytest_components_esp32c3_adc: extends: diff --git a/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py b/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py index ec1023257a..63eeaf09ee 100644 --- a/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py +++ b/components/esp_wifi/test_apps/wifi_connect/pytest_wifi_connect.py @@ -7,14 +7,14 @@ from pytest_embedded_idf.unity_tester import CaseTester @pytest.mark.esp32 @pytest.mark.esp32c3 @pytest.mark.esp32s3 -@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', @@ -28,7 +28,7 @@ def test_wifi_connect_cases_esp32c2_xtal26m(case_tester: CaseTester) -> None: @pytest.mark.esp32c2 -@pytest.mark.wifi_two_dut_eco +@pytest.mark.two_duts_eco @pytest.mark.xtal_26mhz @pytest.mark.parametrize( 'count, config, baud, ', @@ -41,7 +41,7 @@ def test_wifi_connect_cases_esp32c2eco4_xtal26m(case_tester: CaseTester) -> None case_tester.run_all_cases() -@pytest.mark.wifi_two_dut_eco +@pytest.mark.two_duts_eco @pytest.mark.esp32c3 @pytest.mark.parametrize( 'count, config,', diff --git a/conftest.py b/conftest.py index 515a4dd330..6a61ce7de8 100644 --- a/conftest.py +++ b/conftest.py @@ -147,14 +147,14 @@ ENV_MARKERS = { 'ieee802154': 'ieee802154 related tests should run on ieee802154 runners.', 'openthread_br': 'tests should be used for openthread border router.', 'openthread_sleep': 'tests should be used for openthread sleepy device.', - '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.', 'usj_device': 'Test usb_serial_jtag and usb_serial_jtag is used as serial only (not console)', 'wifi_ap_eco': 'a wifi AP in the environment for major version chips', 'generic_eco': 'tests should be run on generic runners for major version chips', - 'wifi_two_dut_eco': 'tests should be run on runners which has two wifi duts connected for major version chips', + 'two_duts_eco': 'tests should be run on runners which has two wifi duts connected for major version chips', } diff --git a/examples/bluetooth/bluedroid/classic_bt/pytest_classic_bt_test.py b/examples/bluetooth/bluedroid/classic_bt/pytest_classic_bt_test.py index 0da49d8a1f..b4b9355473 100644 --- a/examples/bluetooth/bluedroid/classic_bt/pytest_classic_bt_test.py +++ b/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, diff --git a/examples/bluetooth/nimble/pytest_nimble_test.py b/examples/bluetooth/nimble/pytest_nimble_test.py index fdfdb10884..4bc6bff361 100644 --- a/examples/bluetooth/nimble/pytest_nimble_test.py +++ b/examples/bluetooth/nimble/pytest_nimble_test.py @@ -14,7 +14,7 @@ from pytest_embedded_idf.dut import IdfDut @pytest.mark.esp32c3 @pytest.mark.esp32s3 @pytest.mark.esp32 -@pytest.mark.wifi_two_dut +@pytest.mark.two_duts @pytest.mark.parametrize( 'count, app_path', [ (2, @@ -38,7 +38,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', [ @@ -64,7 +64,7 @@ def test_power_save_conn_esp32c2_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None: # Case 2: BLE power save test for ESP32C2ECO4 @pytest.mark.esp32c2 -@pytest.mark.wifi_two_dut_eco +@pytest.mark.two_duts_eco @pytest.mark.xtal_26mhz @pytest.mark.parametrize( 'config, count, app_path, baud,', @@ -94,7 +94,7 @@ def test_power_save_conn_esp32c2eco4_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None: # Case 2: BLE power save test for ESP32C3ECO7 @pytest.mark.esp32c3 -@pytest.mark.wifi_two_dut_eco +@pytest.mark.two_duts_eco @pytest.mark.parametrize( 'config, count, app_path', [ diff --git a/examples/wifi/getting_started/pytest_wifi_getting_started.py b/examples/wifi/getting_started/pytest_wifi_getting_started.py index 59aa3999ac..3bd2908922 100644 --- a/examples/wifi/getting_started/pytest_wifi_getting_started.py +++ b/examples/wifi/getting_started/pytest_wifi_getting_started.py @@ -23,7 +23,7 @@ from pytest_embedded_idf.dut import IdfDut @pytest.mark.esp32 @pytest.mark.esp32c3 @pytest.mark.esp32s3 -@pytest.mark.wifi_two_dut +@pytest.mark.two_duts @pytest.mark.parametrize( 'count, app_path', [ (2, @@ -46,7 +46,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', [ @@ -70,7 +70,7 @@ def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) -> @pytest.mark.esp32c2 -@pytest.mark.wifi_two_dut_eco +@pytest.mark.two_duts_eco @pytest.mark.xtal_26mhz @pytest.mark.parametrize( 'count, config, baud, app_path,', @@ -101,7 +101,7 @@ def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) @pytest.mark.esp32c3 -@pytest.mark.wifi_two_dut_eco +@pytest.mark.two_duts_eco @pytest.mark.parametrize( 'count, config, app_path', [