diff --git a/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/pytest_usb_serial_jtag_vfs.py b/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/pytest_usb_serial_jtag_vfs.py index f64dc7298f..2a4d28565e 100644 --- a/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/pytest_usb_serial_jtag_vfs.py +++ b/components/esp_driver_usb_serial_jtag/test_apps/usb_serial_jtag_vfs/pytest_usb_serial_jtag_vfs.py @@ -13,9 +13,10 @@ from pytest_embedded_idf.utils import idf_parametrize ], indirect=True, ) -@pytest.mark.parametrize('test_message', ['test123456789!@#%^&*']) @idf_parametrize('target', ['esp32s3', 'esp32c3', 'esp32c6', 'esp32h2'], indirect=['target']) -def test_usj_vfs_select(dut: Dut, test_message: list) -> None: +def test_usj_vfs_select(dut: Dut) -> None: + test_message = 'test123456789!@#%^&*' + dut.expect_exact('Press ENTER to see the list of tests') dut.write('"test select read, write and timeout"') dut.expect_exact('select timed out', timeout=2) @@ -32,9 +33,10 @@ def test_usj_vfs_select(dut: Dut, test_message: list) -> None: ], indirect=True, ) -@pytest.mark.parametrize('test_message', ['!(@*#&(!*@&#((SDasdkjhad\nce']) @idf_parametrize('target', ['esp32s3', 'esp32c3', 'esp32c6', 'esp32h2'], indirect=['target']) -def test_usj_vfs_read_return(dut: Dut, test_message: list) -> None: +def test_usj_vfs_read_return(dut: Dut) -> None: + test_message = '!(@*#&(!*@&#((SDasdkjhad\nce' + dut.expect_exact('Press ENTER to see the list of tests') dut.write('"read does not return on new line character"') dut.expect_exact('ready to receive', timeout=2) @@ -50,9 +52,10 @@ def test_usj_vfs_read_return(dut: Dut, test_message: list) -> None: ], indirect=True, ) -@pytest.mark.parametrize('test_message', ['testdata']) @idf_parametrize('target', ['esp32s3', 'esp32c3', 'esp32c6', 'esp32h2'], indirect=['target']) -def test_usj_vfs_read_blocking(dut: Dut, test_message: list) -> None: +def test_usj_vfs_read_blocking(dut: Dut) -> None: + test_message = 'testdata' + dut.expect_exact('Press ENTER to see the list of tests') dut.write('"blocking read returns with available data"') dut.expect_exact('ready to receive', timeout=2) diff --git a/components/esp_vfs_console/test_apps/usb_cdc_vfs/pytest_usb_cdc_vfs.py b/components/esp_vfs_console/test_apps/usb_cdc_vfs/pytest_usb_cdc_vfs.py index e1408e95a3..8693a8b0b9 100644 --- a/components/esp_vfs_console/test_apps/usb_cdc_vfs/pytest_usb_cdc_vfs.py +++ b/components/esp_vfs_console/test_apps/usb_cdc_vfs/pytest_usb_cdc_vfs.py @@ -13,9 +13,10 @@ from pytest_embedded_idf.utils import idf_parametrize ], indirect=True, ) -@pytest.mark.parametrize('test_message', ['test123456789!@#%^&*']) @idf_parametrize('target', ['esp32s3'], indirect=['target']) -def test_usb_cdc_vfs_default(dut: Dut, test_message: str) -> None: +def test_usb_cdc_vfs_default(dut: Dut) -> None: + test_message = 'test123456789!@#%^&*' + # test run: test_usb_cdc_select dut.expect_exact('test_usb_cdc_select', timeout=2) dut.expect_exact('select timed out', timeout=2)