diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/pytest_ble_throughput_test.py b/examples/bluetooth/bluedroid/ble/ble_throughput/pytest_ble_throughput_test.py index e63a87b87d..e99fc108a9 100644 --- a/examples/bluetooth/bluedroid/ble/ble_throughput/pytest_ble_throughput_test.py +++ b/examples/bluetooth/bluedroid/ble/ble_throughput/pytest_ble_throughput_test.py @@ -18,10 +18,10 @@ from pytest_embedded_idf.dut import IdfDut @pytest.mark.esp32s3 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "throughput_server")}|{os.path.join(os.path.dirname(__file__), "throughput_client")}', - 'write'), + 'write', 'y'), ], indirect=True, ) @@ -53,10 +53,10 @@ def test_gatt_write_throughput(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> Non @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "throughput_server")}|{os.path.join(os.path.dirname(__file__), "throughput_client")}', - 'esp32c2_xtal26m_write'), + 'esp32c2_xtal26m_write', 'y'), ], indirect=True, ) @@ -93,10 +93,10 @@ def test_c2_26mhz_xtal_write_throughput(app_path: str, dut: Tuple[IdfDut, IdfDut @pytest.mark.esp32s3 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "throughput_server")}|{os.path.join(os.path.dirname(__file__), "throughput_client")}', - 'notify'), + 'notify', 'y'), ], indirect=True, ) @@ -130,10 +130,10 @@ def test_gatt_notify_throughput(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> No @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "throughput_server")}|{os.path.join(os.path.dirname(__file__), "throughput_client")}', - 'esp32c2_xtal26m_notify'), + 'esp32c2_xtal26m_notify', 'y'), ], indirect=True, ) diff --git a/examples/bluetooth/bluedroid/ble/pytest_ble_test.py b/examples/bluetooth/bluedroid/ble/pytest_ble_test.py index ef454759d3..f2d020c6d1 100644 --- a/examples/bluetooth/bluedroid/ble/pytest_ble_test.py +++ b/examples/bluetooth/bluedroid/ble/pytest_ble_test.py @@ -20,10 +20,10 @@ from pytest_embedded_idf.dut import IdfDut @pytest.mark.esp32c61 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "gatt_server")}|{os.path.join(os.path.dirname(__file__), "gatt_client")}', - 'name'), + 'name', 'y'), ], indirect=True, ) @@ -60,10 +60,10 @@ def test_gatt_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None: @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "gatt_server")}|{os.path.join(os.path.dirname(__file__), "gatt_client")}', - 'esp32c2_xtal26m'), + 'esp32c2_xtal26m', 'y'), ], indirect=True, ) @@ -105,10 +105,10 @@ def test_c2_26mhz_xtal_gatt_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> N @pytest.mark.esp32c61 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "gatt_security_server")}|{os.path.join(os.path.dirname(__file__), "gatt_security_client")}', - 'name'), + 'name', 'y'), ], indirect=True, ) @@ -154,8 +154,6 @@ def test_gatt_security_func(app_path: str, dut: Tuple[IdfDut, IdfDut], target: T assert 'rst:' not in str(gatt_security_server_output) and 'boot:' not in str(gatt_security_server_output) assert 'Disconnected' not in str(gatt_security_client_output) assert 'Disconnected' not in str(gatt_security_server_output) - gatt_security_client.serial.erase_flash() - gatt_security_server.serial.erase_flash() # Case 4: gatt security server and gatt security client test for ESP32C2 26mhz xtal @@ -164,10 +162,10 @@ def test_gatt_security_func(app_path: str, dut: Tuple[IdfDut, IdfDut], target: T @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "gatt_security_server")}|{os.path.join(os.path.dirname(__file__), "gatt_security_client")}', - 'esp32c2_xtal26m'), + 'esp32c2_xtal26m', 'y'), ], indirect=True, ) @@ -207,8 +205,6 @@ def test_c2_26mhz_xtal_gatt_security_func(app_path: str, dut: Tuple[IdfDut, IdfD assert 'rst:' not in str(gatt_security_server_output) and 'boot:' not in str(gatt_security_server_output) assert 'Disconnected' not in str(gatt_security_client_output) assert 'Disconnected' not in str(gatt_security_server_output) - gatt_security_client.serial.erase_flash() - gatt_security_server.serial.erase_flash() # Case 5: ble ibeacon test @@ -221,10 +217,10 @@ def test_c2_26mhz_xtal_gatt_security_func(app_path: str, dut: Tuple[IdfDut, IdfD @pytest.mark.esp32c61 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "ble_ibeacon")}|{os.path.join(os.path.dirname(__file__), "ble_ibeacon")}', - 'sender|receiver'), + 'sender|receiver', 'y'), ], indirect=True, ) @@ -250,10 +246,10 @@ def test_ble_ibeacon_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None: @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "ble_ibeacon")}|{os.path.join(os.path.dirname(__file__), "ble_ibeacon")}', - 'esp32c2_xtal26m_sender|esp32c2_xtal26m_receiver'), + 'esp32c2_xtal26m_sender|esp32c2_xtal26m_receiver', 'y'), ], indirect=True, ) @@ -285,10 +281,10 @@ def test_c2_26mhz_ble_ibeacon_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> @pytest.mark.esp32c61 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "gatt_server")}|{os.path.join(os.path.dirname(__file__), "gatt_client")}', - 'cfg_test'), + 'cfg_test', 'y'), ], indirect=True, ) @@ -325,10 +321,10 @@ def test_gatt_config_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None: @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "gatt_server")}|{os.path.join(os.path.dirname(__file__), "gatt_client")}', - 'esp32c2_cfg_test'), + 'esp32c2_cfg_test', 'y'), ], indirect=True, ) diff --git a/examples/bluetooth/bluedroid/ble_50/pytest_ble50_test.py b/examples/bluetooth/bluedroid/ble_50/pytest_ble50_test.py index e6d72ccac9..b3b42a6a3c 100644 --- a/examples/bluetooth/bluedroid/ble_50/pytest_ble50_test.py +++ b/examples/bluetooth/bluedroid/ble_50/pytest_ble50_test.py @@ -17,10 +17,10 @@ from pytest_embedded_idf.dut import IdfDut @pytest.mark.esp32c61 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "ble50_security_server")}|{os.path.join(os.path.dirname(__file__), "ble50_security_client")}', - 'name'), + 'name', 'y'), ], indirect=True, ) @@ -52,10 +52,10 @@ def test_ble50_security_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None: @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "ble50_security_server")}|{os.path.join(os.path.dirname(__file__), "ble50_security_client")}', - 'esp32c2_xtal26m'), + 'esp32c2_xtal26m', 'y'), ], indirect=True, ) @@ -91,10 +91,10 @@ def test_c2_26mhz_xtal_ble50_security_func(app_path: str, dut: Tuple[IdfDut, Idf @pytest.mark.esp32c61 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "periodic_adv")}|{os.path.join(os.path.dirname(__file__), "periodic_sync")}', - 'name'), + 'name', 'y'), ], indirect=True, ) @@ -122,10 +122,10 @@ def test_period_adv_sync_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) -> None @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "periodic_adv")}|{os.path.join(os.path.dirname(__file__), "periodic_sync")}', - 'esp32c2_xtal26m'), + 'esp32c2_xtal26m', 'y'), ], indirect=True, ) @@ -157,10 +157,10 @@ def test_c2_26mhz_xtal_period_adv_sync_func(app_path: str, dut: Tuple[IdfDut, Id @pytest.mark.esp32c61 @pytest.mark.wifi_two_dut @pytest.mark.parametrize( - 'count, app_path, config', [ + 'count, app_path, config, erase_nvs', [ (2, f'{os.path.join(os.path.dirname(__file__), "ble50_security_server")}|{os.path.join(os.path.dirname(__file__), "ble50_security_client")}', - 'cfg_test'), + 'cfg_test', 'y'), ], indirect=True, ) @@ -194,10 +194,10 @@ def test_ble50_security_config_func(app_path: str, dut: Tuple[IdfDut, IdfDut]) - @pytest.mark.wifi_two_dut @pytest.mark.xtal_26mhz @pytest.mark.parametrize( - 'count, target, baud, app_path, config', [ + 'count, target, baud, app_path, config, erase_nvs', [ (2, 'esp32c2|esp32c2', '74880', f'{os.path.join(os.path.dirname(__file__), "ble50_security_server")}|{os.path.join(os.path.dirname(__file__), "ble50_security_client")}', - 'esp32c2_cfg_test'), + 'esp32c2_cfg_test', 'y'), ], indirect=True, )