From 1302fd70bad5a9e9006803370d7fb2943f012391 Mon Sep 17 00:00:00 2001 From: Peter Marcisovsky Date: Fri, 23 Feb 2024 11:52:45 +0100 Subject: [PATCH] ci: Add esp32s3 runner for usb device example tests - CI USB device tests are run on esp32s3 - usb_host env_marker removed - not used anymore - failing usb_device_ncm test fixed --- examples/peripherals/.build-test-rules.yml | 4 ++-- .../pytest_usb_device_composite.py | 4 ++-- .../usb/device/tusb_console/pytest_usb_device_console.py | 4 ++-- .../peripherals/usb/device/tusb_hid/pytest_usb_device_hid.py | 4 ++-- .../usb/device/tusb_midi/pytest_usb_device_midi.py | 4 ++-- .../peripherals/usb/device/tusb_msc/pytest_usb_device_msc.py | 2 +- .../peripherals/usb/device/tusb_ncm/pytest_usb_device_ncm.py | 5 ++--- .../device/tusb_serial_device/pytest_usb_device_serial.py | 4 ++-- tools/ci/idf_pytest/constants.py | 1 - 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml index dbc92f515a..b2c46d433c 100644 --- a/examples/peripherals/.build-test-rules.yml +++ b/examples/peripherals/.build-test-rules.yml @@ -424,7 +424,7 @@ examples/peripherals/usb/device: disable: - if: SOC_USB_OTG_SUPPORTED != 1 disable_test: - - if: IDF_TARGET not in ["esp32s2"] + - if: IDF_TARGET not in ["esp32s2", "esp32s3"] temporary: true reason: lack of runners with usb_device tag depends_components: @@ -437,7 +437,7 @@ examples/peripherals/usb/device/tusb_ncm: disable: - if: SOC_USB_OTG_SUPPORTED != 1 or SOC_WIFI_SUPPORTED != 1 disable_test: - - if: IDF_TARGET not in ["esp32s2"] + - if: IDF_TARGET not in ["esp32s2", "esp32s3"] temporary: true reason: lack of runners with usb_device tag depends_components: diff --git a/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/pytest_usb_device_composite.py b/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/pytest_usb_device_composite.py index 843b703128..2f30ac4b3e 100644 --- a/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/pytest_usb_device_composite.py +++ b/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/pytest_usb_device_composite.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 from time import sleep @@ -11,7 +11,7 @@ from serial.tools.list_ports import comports @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32p4 -@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag') +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag') @pytest.mark.usb_device def test_usb_composite_device_serial_example(dut: Dut) -> None: dut.expect_exact('Hello World!') diff --git a/examples/peripherals/usb/device/tusb_console/pytest_usb_device_console.py b/examples/peripherals/usb/device/tusb_console/pytest_usb_device_console.py index b32b19f5d8..37b0e5bfcc 100644 --- a/examples/peripherals/usb/device/tusb_console/pytest_usb_device_console.py +++ b/examples/peripherals/usb/device/tusb_console/pytest_usb_device_console.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 from time import sleep @@ -11,7 +11,7 @@ from serial.tools.list_ports import comports @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32p4 -@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag') +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag') @pytest.mark.usb_device def test_usb_device_console_example(dut: Dut) -> None: dut.expect_exact('USB initialization DONE') diff --git a/examples/peripherals/usb/device/tusb_hid/pytest_usb_device_hid.py b/examples/peripherals/usb/device/tusb_hid/pytest_usb_device_hid.py index d3b41ff038..25f6231787 100644 --- a/examples/peripherals/usb/device/tusb_hid/pytest_usb_device_hid.py +++ b/examples/peripherals/usb/device/tusb_hid/pytest_usb_device_hid.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import pytest from pytest_embedded import Dut @@ -7,7 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32p4 -@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag') +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag') @pytest.mark.usb_device def test_usb_device_hid_example(dut: Dut) -> None: dut.expect_exact('USB initialization DONE') diff --git a/examples/peripherals/usb/device/tusb_midi/pytest_usb_device_midi.py b/examples/peripherals/usb/device/tusb_midi/pytest_usb_device_midi.py index 2e9c7d05ba..271591a170 100644 --- a/examples/peripherals/usb/device/tusb_midi/pytest_usb_device_midi.py +++ b/examples/peripherals/usb/device/tusb_midi/pytest_usb_device_midi.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import pytest from pytest_embedded import Dut @@ -7,7 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32p4 -@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag') +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag') @pytest.mark.usb_device def test_usb_device_midi_example(dut: Dut) -> None: dut.expect_exact('USB initialization DONE') diff --git a/examples/peripherals/usb/device/tusb_msc/pytest_usb_device_msc.py b/examples/peripherals/usb/device/tusb_msc/pytest_usb_device_msc.py index bac44fe8c1..6e81249750 100644 --- a/examples/peripherals/usb/device/tusb_msc/pytest_usb_device_msc.py +++ b/examples/peripherals/usb/device/tusb_msc/pytest_usb_device_msc.py @@ -7,7 +7,7 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32p4 -@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag') +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag') @pytest.mark.usb_device def test_usb_device_msc_example(dut: Dut) -> None: dut.expect('Mount storage') diff --git a/examples/peripherals/usb/device/tusb_ncm/pytest_usb_device_ncm.py b/examples/peripherals/usb/device/tusb_ncm/pytest_usb_device_ncm.py index e31841b8b9..743e31de24 100644 --- a/examples/peripherals/usb/device/tusb_ncm/pytest_usb_device_ncm.py +++ b/examples/peripherals/usb/device/tusb_ncm/pytest_usb_device_ncm.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 import subprocess import time @@ -9,14 +9,13 @@ from pytest_embedded import Dut @pytest.mark.esp32s2 @pytest.mark.esp32s3 -@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag') @pytest.mark.usb_device def test_usb_device_ncm_example(dut: Dut) -> None: netif_mac = dut.expect(r'Network interface HW address: ([0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2})') netif_mac = netif_mac.group(1).decode('utf-8') dut.expect_exact('USB NCM and WiFi initialized and started') dut.expect_exact('Returned from app_main()') - time.sleep(1) # Wait 1s for the network interface to appear + time.sleep(5) # Wait 5s for the network interface to appear out_bytes = subprocess.check_output('ifconfig', shell=True, timeout=5) out_str = out_bytes.decode('utf-8') print('expected network interface HW address: ', netif_mac) diff --git a/examples/peripherals/usb/device/tusb_serial_device/pytest_usb_device_serial.py b/examples/peripherals/usb/device/tusb_serial_device/pytest_usb_device_serial.py index 545b4ee3a4..962490d84e 100644 --- a/examples/peripherals/usb/device/tusb_serial_device/pytest_usb_device_serial.py +++ b/examples/peripherals/usb/device/tusb_serial_device/pytest_usb_device_serial.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 from time import sleep @@ -11,7 +11,7 @@ from serial.tools.list_ports import comports @pytest.mark.esp32s2 @pytest.mark.esp32s3 @pytest.mark.esp32p4 -@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag') +@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag') @pytest.mark.usb_device def test_usb_device_serial_example(dut: Dut) -> None: dut.expect_exact('USB initialization DONE') diff --git a/tools/ci/idf_pytest/constants.py b/tools/ci/idf_pytest/constants.py index 8ab64183f0..14236b0764 100644 --- a/tools/ci/idf_pytest/constants.py +++ b/tools/ci/idf_pytest/constants.py @@ -58,7 +58,6 @@ ENV_MARKERS = { 'eth_dm9051': 'SPI Ethernet module with two DM9051', 'quad_psram': 'runners with quad psram', 'octal_psram': 'runners with octal psram', - 'usb_host': 'usb host runners', 'usb_host_flash_disk': 'usb host runners with USB flash disk attached', 'usb_device': 'usb device runners', 'ethernet_ota': 'ethernet OTA runners',