espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: rename wifi_two_dut to two_duts

Browse Source
This commit is contained in:
Chen Yudong
2025-12-03 11:20:33 +08:00
parent 0db814d8dd
commit 844f5ce69a
10 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/target-test.yml
+32 -32
View File
@@ -532,59 +532,59 @@ pytest_examples_esp32_flash_encryption:
artifacts: false
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:
- job: build_pytest_examples_esp32
artifacts: false
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:
- job: build_pytest_examples_esp32c3
artifacts: false
tags: [ esp32c3, wifi_two_dut ]
tags: [ esp32c3, two_duts ]
pytest_examples_esp32c3eco7_wifi_two_dut:
pytest_examples_esp32c3eco7_two_duts:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32c3-wifi
needs:
- job: build_pytest_examples_esp32c3
artifacts: false
tags: [ wifi_two_dut_eco, esp32c3 ]
tags: [ two_duts_eco, esp32c3 ]
pytest_examples_esp32s3_wifi_two_dut:
pytest_examples_esp32s3_two_duts:
extends:
- .pytest_examples_dir_template
- .rules:test:example_test-esp32s3-wifi
needs:
- job: build_pytest_examples_esp32s3
artifacts: false
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:
- job: build_pytest_examples_esp32c2
artifacts: false
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:
- job: build_pytest_examples_esp32c2
artifacts: false
tags: [ wifi_two_dut_eco, xtal_26mhz , esp32c2]
tags: [ two_duts_eco, xtal_26mhz , esp32c2]
pytest_examples_esp32c3_flash_encryption:
extends:
@@ -755,14 +755,14 @@ pytest_components_esp32_generic_multi_device:
artifacts: false
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
needs:
- job: build_pytest_components_esp32
artifacts: false
tags: [ esp32, wifi_two_dut ]
tags: [ esp32, two_duts ]
pytest_components_esp32_adc:
extends:
@@ -1127,14 +1127,14 @@ pytest_components_esp32c3_generic_multi_device:
artifacts: false
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:
- job: build_pytest_components_esp32c3
artifacts: false
tags: [ esp32c3, wifi_two_dut ]
tags: [ esp32c3, two_duts ]
pytest_components_esp32c3_usb_serial_jtag:
extends:
@@ -1144,23 +1144,23 @@ pytest_components_esp32c3_usb_serial_jtag:
- build_pytest_components_esp32c3
tags: [ esp32c3, usb_serial_jtag ]
pytest_components_esp32s3_wifi_two_dut:
pytest_components_esp32s3_two_duts:
extends:
- .pytest_components_dir_template
- .rules:test:component_ut-esp32s3-wifi
needs:
- job: build_pytest_components_esp32s3
artifacts: false
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:
- job: build_pytest_components_esp32c2
artifacts: false
tags: [ esp32c2, wifi_two_dut, xtal_26mhz ]
tags: [ esp32c2, two_duts, xtal_26mhz ]
pytest_components_esp32c3_adc:
extends:
@@ -1576,56 +1576,56 @@ pytest_test_apps_esp32s3_mspi_f4r4:
artifacts: false
tags: [ esp32s3, MSPI_F4R4 ]
pytest_test_apps_esp32s2_wifi_two_dut:
pytest_test_apps_esp32s2_two_duts:
extends:
- .pytest_test_apps_dir_template
- .rules:test:custom_test-esp32s2-wifi
needs:
- job: build_pytest_test_apps_esp32s2
artifacts: false
tags: [ esp32s2, wifi_two_dut ]
tags: [ esp32s2, two_duts ]
pytest_test_apps_esp32s3_wifi_two_dut:
pytest_test_apps_esp32s3_two_duts:
extends:
- .pytest_test_apps_dir_template
- .rules:test:custom_test-esp32s3-wifi
needs:
- job: build_pytest_test_apps_esp32s3
artifacts: false
tags: [ esp32s3, wifi_two_dut ]
tags: [ esp32s3, two_duts ]
pytest_test_apps_esp32c2_wifi_two_dut:
pytest_test_apps_esp32c2_two_duts:
extends:
- .pytest_test_apps_dir_template
- .rules:test:custom_test-esp32c2-wifi
needs:
- job: build_pytest_test_apps_esp32c2
artifacts: false
tags: [ esp32c2, wifi_two_dut, xtal_26mhz ]
tags: [ esp32c2, two_duts, xtal_26mhz ]
pytest_test_apps_esp32c3_wifi_two_dut:
pytest_test_apps_esp32c3_two_duts:
extends:
- .pytest_test_apps_dir_template
- .rules:test:custom_test-esp32c3-wifi
needs:
- job: build_pytest_test_apps_esp32c3
artifacts: false
tags: [ esp32c3, wifi_two_dut]
tags: [ esp32c3, two_duts]
pytest_test_apps_esp32c2eco4_wifi_two_dut:
pytest_test_apps_esp32c2eco4_two_duts:
extends:
- .pytest_test_apps_dir_template
- .rules:test:custom_test-esp32c2-wifi
needs:
- job: build_pytest_test_apps_esp32c2
artifacts: false
tags: [ wifi_two_dut_eco, xtal_26mhz, esp32c2 ]
tags: [ two_duts_eco, xtal_26mhz, esp32c2 ]
pytest_test_apps_esp32c3eco7_wifi_two_dut:
pytest_test_apps_esp32c3eco7_two_duts:
extends:
- .pytest_test_apps_dir_template
- .rules:test:custom_test-esp32c3-wifi
needs:
- job: build_pytest_test_apps_esp32c3
artifacts: false
tags: [ wifi_two_dut_eco, esp32c3]
tags: [ two_duts_eco, esp32c3]
components/driver/test_apps/temperature_sensor/pytest_temperature_sensor.py
+3 -4
View File
@@ -1,6 +1,5 @@
# SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
# SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0
import pytest
from pytest_embedded import Dut
from pytest_embedded_idf.unity_tester import CaseTester
@@ -35,9 +34,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
+4 -4
View File
@@ -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',
@@ -42,7 +42,7 @@ def test_wifi_connect_cases_esp32c2eco4_xtal26m(case_tester: CaseTester) -> None
@pytest.mark.esp32c3
@pytest.mark.wifi_two_dut_eco
@pytest.mark.two_duts_eco
@pytest.mark.parametrize(
'count, config',
[
components/wpa_supplicant/test_apps/main/test_offchannel.c
+1 -1
View File
@@ -240,4 +240,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
+6 -6
View File
@@ -22,7 +22,7 @@ def test_wpa_supplicant_ut(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',
[
@@ -32,12 +32,12 @@ 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.esp32c2
@pytest.mark.wifi_two_dut_eco
@pytest.mark.two_duts_eco
@pytest.mark.xtal_26mhz
@pytest.mark.parametrize(
'count, config, baud',
@@ -52,12 +52,12 @@ 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.esp32c3
@pytest.mark.wifi_two_dut_eco
@pytest.mark.two_duts_eco
@pytest.mark.parametrize(
'count, config',
[
@@ -70,5 +70,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/classic_bt/pytest_classic_bt_test.py
+7 -7
View File
@@ -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
+4 -4
View File
@@ -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(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',
[
examples/wifi/getting_started/pytest_wifi_getting_started.py
+4 -4
View File
@@ -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]) ->
softap.expect('station .+ join, AID=', timeout=60)
@pytest.mark.wifi_two_dut_eco
@pytest.mark.two_duts_eco
@pytest.mark.xtal_26mhz
@pytest.mark.esp32c2
@pytest.mark.parametrize(
@@ -101,7 +101,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_eco
@pytest.mark.two_duts_eco
@pytest.mark.esp32c3
@pytest.mark.parametrize(
'count, config, app_path',
tools/ci/idf_pytest/constants.py
+2 -2
View File
@@ -101,14 +101,14 @@ 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.',
'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',
}
tools/test_apps/phy/phy_tsens/pytest_phy_tsens.py
+4 -4
View File
@@ -147,7 +147,7 @@ def run_phy_tsens_test_with_light_sleep(dut: Tuple[Dut, Dut]) -> None:
@pytest.mark.esp32c6
@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:
@@ -166,7 +166,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',
@@ -191,7 +191,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_eco
@pytest.mark.two_duts_eco
@pytest.mark.xtal_26mhz
@pytest.mark.esp32c2
@pytest.mark.parametrize(
@@ -217,7 +217,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_eco
@pytest.mark.two_duts_eco
@pytest.mark.esp32c3
@pytest.mark.parametrize(
'count, config, ',