From 01864a3ba4c07c49211e457af76807b0fb166751 Mon Sep 17 00:00:00 2001 From: Euripedes Rocha Filho Date: Fri, 25 Sep 2026 14:30:21 +0200 Subject: [PATCH] ci: Change tag used in tests --- examples/mqtt5/pytest_mqtt5.py | 2 +- examples/ssl/pytest_mqtt_ssl.py | 2 +- examples/tcp/pytest_mqtt_tcp.py | 2 +- examples/ws/pytest_mqtt_ws_example.py | 2 +- examples/wss/pytest_mqtt_wss_example.py | 2 +- pytest.ini | 5 +++-- test/apps/mqtt/pytest_mqtt_ut.py | 2 +- test/apps/mqtt5/pytest_mqtt5_ut.py | 2 +- test/apps/publish_connect_test/pytest_mqtt_app.py | 2 +- test/apps/publish_connect_test/pytest_mqtt_publish_app.py | 8 ++++---- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/examples/mqtt5/pytest_mqtt5.py b/examples/mqtt5/pytest_mqtt5.py index 323294b..0a5c00a 100644 --- a/examples/mqtt5/pytest_mqtt5.py +++ b/examples/mqtt5/pytest_mqtt5.py @@ -10,7 +10,7 @@ from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_examples_protocol_mqtt5(dut: Dut) -> None: """ diff --git a/examples/ssl/pytest_mqtt_ssl.py b/examples/ssl/pytest_mqtt_ssl.py index e6ac1de..da14267 100644 --- a/examples/ssl/pytest_mqtt_ssl.py +++ b/examples/ssl/pytest_mqtt_ssl.py @@ -64,7 +64,7 @@ def on_message(client, userdata, msg): # type: (mqtt.Client, tuple, mqtt.client message_log += "Received data:" + msg.topic + " " + payload + "\n" -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_examples_protocol_mqtt_ssl(dut): # type: (Dut) -> None broker_url = "" diff --git a/examples/tcp/pytest_mqtt_tcp.py b/examples/tcp/pytest_mqtt_tcp.py index c90c863..e0de42f 100644 --- a/examples/tcp/pytest_mqtt_tcp.py +++ b/examples/tcp/pytest_mqtt_tcp.py @@ -53,7 +53,7 @@ def mqqt_server_sketch(my_ip, port): # type: (str, str) -> None logging.info("server closed") -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_examples_protocol_mqtt_qos1(dut: Dut) -> None: global msgid diff --git a/examples/ws/pytest_mqtt_ws_example.py b/examples/ws/pytest_mqtt_ws_example.py index ee9837f..17ef6df 100644 --- a/examples/ws/pytest_mqtt_ws_example.py +++ b/examples/ws/pytest_mqtt_ws_example.py @@ -45,7 +45,7 @@ def on_message(client, userdata, msg): # type: (mqtt.Client, tuple, mqtt.client message_log += "Received data:" + msg.topic + " " + payload + "\n" -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_examples_protocol_mqtt_ws(dut): # type: (Dut) -> None broker_url = "" diff --git a/examples/wss/pytest_mqtt_wss_example.py b/examples/wss/pytest_mqtt_wss_example.py index 9a4f392..4d72544 100644 --- a/examples/wss/pytest_mqtt_wss_example.py +++ b/examples/wss/pytest_mqtt_wss_example.py @@ -47,7 +47,7 @@ def on_message(client, userdata, msg): # type: (mqtt.Client, tuple, mqtt.client message_log += "Received data:" + msg.topic + " " + payload + "\n" -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_examples_protocol_mqtt_wss(dut): # type: (Dut) -> None # type: ignore broker_url = "" diff --git a/pytest.ini b/pytest.ini index 3502acb..8db5076 100644 --- a/pytest.ini +++ b/pytest.ini @@ -16,8 +16,9 @@ filterwarnings = junit_family = xunit1 env_markers = - eth_ip101: Ethernet IP101 PHY required for test - eth_ip101_stress: Ethernet IP101 PHY required for stress test + eth_cfg_default: Default Ethernet configuration required for test + eth_cfg_default_stress: Default Ethernet configuration required for stress test + eth_ip101: ESP32-Ethernet-Kit required; OpenOCD coverage dump generic: applicable to generic ESP devices # log related diff --git a/test/apps/mqtt/pytest_mqtt_ut.py b/test/apps/mqtt/pytest_mqtt_ut.py index 1aecad4..b5c7a80 100644 --- a/test/apps/mqtt/pytest_mqtt_ut.py +++ b/test/apps/mqtt/pytest_mqtt_ut.py @@ -5,7 +5,7 @@ from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_mqtt_client(dut: Dut) -> None: dut.expect_unity_test_output() diff --git a/test/apps/mqtt5/pytest_mqtt5_ut.py b/test/apps/mqtt5/pytest_mqtt5_ut.py index 91c0167..bd0dfb1 100644 --- a/test/apps/mqtt5/pytest_mqtt5_ut.py +++ b/test/apps/mqtt5/pytest_mqtt5_ut.py @@ -5,7 +5,7 @@ from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_mqtt5_client(dut: Dut) -> None: dut.expect_unity_test_output() diff --git a/test/apps/publish_connect_test/pytest_mqtt_app.py b/test/apps/publish_connect_test/pytest_mqtt_app.py index 00b71ed..3bea7ca 100644 --- a/test/apps/publish_connect_test/pytest_mqtt_app.py +++ b/test/apps/publish_connect_test/pytest_mqtt_app.py @@ -257,7 +257,7 @@ def run_cases(dut: Dut, uri: str, cases: Dict[str, int]) -> None: dut.write("destroy") -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @idf_parametrize("target", ["esp32"], indirect=["target"]) def test_mqtt_connect( dut: Dut, diff --git a/test/apps/publish_connect_test/pytest_mqtt_publish_app.py b/test/apps/publish_connect_test/pytest_mqtt_publish_app.py index 1e72e6a..75c6bbe 100644 --- a/test/apps/publish_connect_test/pytest_mqtt_publish_app.py +++ b/test/apps/publish_connect_test/pytest_mqtt_publish_app.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Unlicense OR CC0-1.0 import contextlib import difflib @@ -371,7 +371,7 @@ test_cases = make_cases(transport_cases, get_scenarios()) stress_test_cases = make_cases(transport_cases, stress_scenarios) -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @pytest.mark.parametrize( "test_case", test_cases, ids=[generate_test_id(case) for case in test_cases] ) @@ -385,7 +385,7 @@ def test_mqtt_publish(dut: Dut, test_case: Any) -> None: run_publish_test_case(dut, publish_cfg) -@pytest.mark.eth_ip101_stress +@pytest.mark.eth_cfg_default_stress @pytest.mark.nightly_run @pytest.mark.parametrize( "test_case", @@ -405,7 +405,7 @@ def test_mqtt_publish_stress(dut: Dut, test_case: Any) -> None: local_test_cases = make_cases(local_broker_supported_transports, local_broker_scenarios) -@pytest.mark.eth_ip101 +@pytest.mark.eth_cfg_default @pytest.mark.parametrize( "test_case", local_test_cases,