diff --git a/examples/wifi/.build-test-rules.yml b/examples/wifi/.build-test-rules.yml index 05b637362a..2d379ddcfd 100644 --- a/examples/wifi/.build-test-rules.yml +++ b/examples/wifi/.build-test-rules.yml @@ -36,11 +36,11 @@ examples/wifi/ftm: examples/wifi/getting_started: <<: *wifi_depends_default enable: - - if: INCLUDE_DEFAULT == 1 || IDF_TARGET == "esp32h2" + - if: INCLUDE_DEFAULT == 1 disable: - - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) + - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) and (IDF_TARGET != "esp32h2") disable_test: - - if: IDF_TARGET == "esp32p4" + - if: IDF_TARGET in ["esp32p4", "esp32h2"] temporary: true reason: lack of runners depends_filepatterns: @@ -48,10 +48,10 @@ examples/wifi/getting_started: examples/wifi/iperf: enable: - - if: INCLUDE_DEFAULT == 1 || IDF_TARGET == "esp32h2" + - if: INCLUDE_DEFAULT == 1 disable: - - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) - - if: (IDF_TARGET == "esp32p4") and CONFIG_NAME in ["defaults", "99"] + - if: (SOC_WIFI_SUPPORTED != 1) and (SOC_WIRELESS_HOST_SUPPORTED != 1) and (IDF_TARGET != "esp32h2") + - if: IDF_TARGET in ["esp32p4"] and CONFIG_NAME in ["defaults", "99"] disable_test: - if: IDF_TARGET not in ["esp32"] temporary: true diff --git a/examples/wifi/getting_started/pytest_wifi_getting_started.py b/examples/wifi/getting_started/pytest_wifi_getting_started.py index 5a3ad64d27..c0e96d4ae6 100644 --- a/examples/wifi/getting_started/pytest_wifi_getting_started.py +++ b/examples/wifi/getting_started/pytest_wifi_getting_started.py @@ -1,11 +1,11 @@ # SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import os.path -from typing import Tuple import pytest from pytest_embedded_idf.dut import IdfDut from pytest_embedded_idf.utils import idf_parametrize + # @pytest.mark.supported_targets # This test should support all targets, even between different target types # For now our CI only support multi dut with esp32 @@ -32,9 +32,11 @@ from pytest_embedded_idf.utils import idf_parametrize indirect=True, ) @idf_parametrize( - 'target', ['esp32', 'esp32c3', 'esp32s2', 'esp32s3', 'esp32c5', 'esp32c6', 'esp32c61'], indirect=['target'] + 'target', + ['esp32', 'esp32c3', 'esp32s2', 'esp32s3', 'esp32c5', 'esp32c6', 'esp32c61'], + indirect=['target'], ) -def test_wifi_getting_started(dut: Tuple[IdfDut, IdfDut]) -> None: +def test_wifi_getting_started(dut: tuple[IdfDut, IdfDut]) -> None: softap = dut[0] station = dut[1] @@ -64,7 +66,7 @@ def test_wifi_getting_started(dut: Tuple[IdfDut, IdfDut]) -> None: indirect=True, ) @idf_parametrize('target', ['esp32c2'], indirect=['target']) -def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None: +def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: tuple[IdfDut, IdfDut]) -> None: softap = dut[0] station = dut[1] @@ -96,7 +98,7 @@ def test_wifi_getting_started_esp32c2_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) -> indirect=True, ) @idf_parametrize('target', ['esp32c2'], indirect=['target']) -def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) -> None: +def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: tuple[IdfDut, IdfDut]) -> None: softap = dut[0] station = dut[1] @@ -126,7 +128,7 @@ def test_wifi_getting_started_esp32c2eco4_xtal_26mhz(dut: Tuple[IdfDut, IdfDut]) indirect=True, ) @idf_parametrize('target', ['esp32c3'], indirect=['target']) -def test_wifi_getting_started_esp32c3eco7(dut: Tuple[IdfDut, IdfDut]) -> None: +def test_wifi_getting_started_esp32c3eco7(dut: tuple[IdfDut, IdfDut]) -> None: softap = dut[0] station = dut[1] diff --git a/examples/wifi/getting_started/softAP/README.md b/examples/wifi/getting_started/softAP/README.md index 4f90182c11..f7bf096318 100644 --- a/examples/wifi/getting_started/softAP/README.md +++ b/examples/wifi/getting_started/softAP/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- | # Wi-Fi SoftAP Example diff --git a/examples/wifi/getting_started/station/README.md b/examples/wifi/getting_started/station/README.md index 0b267d859e..2d1d7fd7c1 100644 --- a/examples/wifi/getting_started/station/README.md +++ b/examples/wifi/getting_started/station/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- | # Wi-Fi Station Example diff --git a/examples/wifi/getting_started/station/pytest_wifi_station.py b/examples/wifi/getting_started/station/pytest_wifi_station.py index 5a93da1631..359452f088 100644 --- a/examples/wifi/getting_started/station/pytest_wifi_station.py +++ b/examples/wifi/getting_started/station/pytest_wifi_station.py @@ -1,12 +1,12 @@ # SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Unlicense OR CC0-1.0 import os -from typing import Callable -from typing import Tuple +from collections.abc import Callable import pytest from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize + # diff of esp32s2/esp32s3 ~45K, others ~50K DIFF_THRESHOLD = { @@ -24,7 +24,7 @@ DIFF_THRESHOLD = { indirect=['target'], ) def test_wifi_sdkconfig_disable_softap_save_binary_size( - dut: Tuple[Dut, Dut], + dut: tuple[Dut, Dut], log_performance: Callable[[str, object], None], ) -> None: # dut logs are not needed diff --git a/examples/wifi/iperf/README.md b/examples/wifi/iperf/README.md index 47e96ee823..a518e9c7af 100644 --- a/examples/wifi/iperf/README.md +++ b/examples/wifi/iperf/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- | # Iperf Example