Skip to content

Commit 04dbe66

Browse files
committed
Merge branch 'ci/temp_disable_s3_usb_device' into 'master'
fix(ci): Temporarily disable USB device tests on S3 See merge request espressif/esp-idf!30312
2 parents e82a723 + 6b10a30 commit 04dbe66

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

examples/peripherals/.build-test-rules.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ examples/peripherals/usb/device:
444444
disable:
445445
- if: SOC_USB_OTG_SUPPORTED != 1
446446
disable_test:
447-
- if: IDF_TARGET not in ["esp32s2", "esp32s3"]
447+
- if: IDF_TARGET not in ["esp32s2"]
448448
temporary: true
449449
reason: lack of runners with usb_device tag
450450
depends_components:
@@ -457,7 +457,7 @@ examples/peripherals/usb/device/tusb_ncm:
457457
disable:
458458
- if: SOC_USB_OTG_SUPPORTED != 1 or SOC_WIFI_SUPPORTED != 1
459459
disable_test:
460-
- if: IDF_TARGET not in ["esp32s2", "esp32s3"]
460+
- if: IDF_TARGET not in ["esp32s2"]
461461
temporary: true
462462
reason: lack of runners with usb_device tag
463463
depends_components:

examples/peripherals/usb/device/tusb_composite_msc_serialdevice/pytest_usb_device_composite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@pytest.mark.esp32s2
1212
@pytest.mark.esp32s3
1313
@pytest.mark.esp32p4
14-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag')
14+
@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag')
1515
@pytest.mark.usb_device
1616
def test_usb_composite_device_serial_example(dut: Dut) -> None:
1717
dut.expect_exact('Hello World!')

examples/peripherals/usb/device/tusb_console/pytest_usb_device_console.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@pytest.mark.esp32s2
1212
@pytest.mark.esp32s3
1313
@pytest.mark.esp32p4
14-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag')
14+
@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag')
1515
@pytest.mark.usb_device
1616
def test_usb_device_console_example(dut: Dut) -> None:
1717
dut.expect_exact('USB initialization DONE')

examples/peripherals/usb/device/tusb_hid/pytest_usb_device_hid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@pytest.mark.esp32s2
88
@pytest.mark.esp32s3
99
@pytest.mark.esp32p4
10-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag')
10+
@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag')
1111
@pytest.mark.usb_device
1212
def test_usb_device_hid_example(dut: Dut) -> None:
1313
dut.expect_exact('USB initialization DONE')

examples/peripherals/usb/device/tusb_midi/pytest_usb_device_midi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@pytest.mark.esp32s2
88
@pytest.mark.esp32s3
99
@pytest.mark.esp32p4
10-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag')
10+
@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag')
1111
@pytest.mark.usb_device
1212
def test_usb_device_midi_example(dut: Dut) -> None:
1313
dut.expect_exact('USB initialization DONE')

examples/peripherals/usb/device/tusb_msc/pytest_usb_device_msc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@pytest.mark.esp32s2
88
@pytest.mark.esp32s3
99
@pytest.mark.esp32p4
10-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag')
10+
@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag')
1111
@pytest.mark.usb_device
1212
def test_usb_device_msc_example(dut: Dut) -> None:
1313
dut.expect('Mount storage')

examples/peripherals/usb/device/tusb_ncm/pytest_usb_device_ncm.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99

1010
@pytest.mark.esp32s2
1111
@pytest.mark.esp32s3
12+
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='lack of runners with usb_device tag')
1213
@pytest.mark.usb_device
1314
def test_usb_device_ncm_example(dut: Dut) -> None:
1415
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})')
1516
netif_mac = netif_mac.group(1).decode('utf-8')
1617
dut.expect_exact('USB NCM and WiFi initialized and started')
1718
dut.expect_exact('Returned from app_main()')
18-
time.sleep(5) # Wait 5s for the network interface to appear
19+
time.sleep(1) # Wait 1s for the network interface to appear
1920
out_bytes = subprocess.check_output('ifconfig', shell=True, timeout=5)
2021
out_str = out_bytes.decode('utf-8')
2122
print('expected network interface HW address: ', netif_mac)

examples/peripherals/usb/device/tusb_serial_device/pytest_usb_device_serial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@pytest.mark.esp32s2
1212
@pytest.mark.esp32s3
1313
@pytest.mark.esp32p4
14-
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='lack of runners with usb_device tag')
14+
@pytest.mark.temp_skip_ci(targets=['esp32s3', 'esp32p4'], reason='lack of runners with usb_device tag')
1515
@pytest.mark.usb_device
1616
def test_usb_device_serial_example(dut: Dut) -> None:
1717
dut.expect_exact('USB initialization DONE')

0 commit comments

Comments
 (0)