pytest-embedded 2.8.0__tar.gz → 2.8.1__tar.gz

{pytest_embedded-2.8.0 → pytest_embedded-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-embedded
-Version: 2.8.0
+Version: 2.8.1
 Summary: A pytest plugin that designed for embedded testing.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=3.10

{pytest_embedded-2.8.0 → pytest_embedded-2.8.1}/pytest_embedded/__init__.py

@@ -6,4 +6,4 @@ from .dut_factory import DutFactory
 
 __all__ = ['App', 'Dut', 'DutFactory']
 
-__version__ = '2.8.0'
+__version__ = '2.8.1'

{pytest_embedded-2.8.0 → pytest_embedded-2.8.1}/pytest_embedded/dut_factory.py

@@ -141,6 +141,7 @@ def _fixture_classes_and_options_fn(
     erase_all,
     esptool_baud,
     esp_flash_force,
+    no_fast_flash,
     part_tool,
     confirm_target_elf_sha256,
     erase_nvs,
@@ -157,6 +158,7 @@ def _fixture_classes_and_options_fn(
     qemu_extra_args,
     qemu_efuse_path,
     wokwi_diagram,
+    wokwi_usb_serial_jtag,
     skip_regenerate_image,
     encrypt,
     keyfile,
@@ -253,6 +255,7 @@ def _fixture_classes_and_options_fn(
                     kwargs[fixture].update(
                         {
                             'app': None,
+                            'fast_flash': not no_fast_flash if no_fast_flash is not None else True,
                         }
                     )
                 elif 'nuttx' in _services:
@@ -335,6 +338,7 @@ def _fixture_classes_and_options_fn(
                 kwargs[fixture].update(
                     {
                         'wokwi_diagram': wokwi_diagram,
+                        'wokwi_usb_serial_jtag': wokwi_usb_serial_jtag,
                         'msg_queue': msg_queue,
                         'app': None,
                         'meta': _meta,
@@ -680,6 +684,7 @@ class DutFactory:
         erase_all: bool | None = None,
         esptool_baud: int | None = None,
         esp_flash_force: bool | None = False,
+        no_fast_flash: bool | None = None,
         part_tool: str | None = None,
         confirm_target_elf_sha256: bool | None = None,
         erase_nvs: bool | None = None,
@@ -696,6 +701,7 @@ class DutFactory:
         qemu_extra_args: str | None = None,
         qemu_efuse_path: str | None = None,
         wokwi_diagram: str | None = None,
+        wokwi_usb_serial_jtag: bool | None = None,
         skip_regenerate_image: bool | None = None,
         encrypt: bool | None = None,
         keyfile: str | None = None,
@@ -743,6 +749,7 @@ class DutFactory:
             qemu_extra_args: Additional QEMU arguments.
             qemu_efuse_path: Efuse binary path.
             wokwi_diagram: Wokwi diagram path.
+            wokwi_usb_serial_jtag: Use USB Serial JTAG instead of UART for Wokwi serial communication.
             skip_regenerate_image: Skip image regeneration flag.
             encrypt: Encryption flag.
             keyfile: Keyfile for encryption.
@@ -797,6 +804,7 @@ class DutFactory:
                 'erase_all': erase_all,
                 'esptool_baud': esptool_baud,
                 'esp_flash_force': esp_flash_force,
+                'no_fast_flash': no_fast_flash,
                 'part_tool': part_tool,
                 'confirm_target_elf_sha256': confirm_target_elf_sha256,
                 'erase_nvs': erase_nvs,
@@ -813,6 +821,7 @@ class DutFactory:
                 'qemu_extra_args': qemu_extra_args,
                 'qemu_efuse_path': qemu_efuse_path,
                 'wokwi_diagram': wokwi_diagram,
+                'wokwi_usb_serial_jtag': wokwi_usb_serial_jtag,
                 'skip_regenerate_image': skip_regenerate_image,
                 'encrypt': encrypt,
                 'keyfile': keyfile,

{pytest_embedded-2.8.0 → pytest_embedded-2.8.1}/pytest_embedded/plugin.py

@@ -209,6 +209,17 @@ def pytest_addoption(parser):
         action='store_true',
         help='force mode for esptool',
     )
+    arduino_group = parser.getgroup('embedded-arduino')
+    arduino_group.addoption(
+        '--no-fast-flash',
+        help=(
+            'y/yes/true for True and n/no/false for False. '
+            'Set to True to disable fast reflashing (--diff-with) for Arduino. '
+            'Useful when flash state is unknown, e.g. after OTA updates. '
+            '(Default: False)'
+        ),
+    )
+
     idf_group = parser.getgroup('embedded-idf')
     idf_group.addoption(
         '--supported-targets', help='Comma-separated list of supported targets for the test case. (Default: None)'
@@ -298,6 +309,13 @@ def pytest_addoption(parser):
         '--wokwi-diagram',
         help='Path to the wokwi diagram file (Default: None)',
     )
+    wokwi_group.addoption(
+        '--wokwi-usb-serial-jtag',
+        help='y/yes/true for True and n/no/false for False. '
+        'Use USB Serial JTAG instead of UART for serial communication in the Wokwi diagram. '
+        'When enabled, the diagram will use the USB_SERIAL_JTAG interface and remove $serialMonitor connections. '
+        '(Default: False)',
+    )
 
 
 ###########
@@ -842,6 +860,13 @@ def esp_flash_force(request: FixtureRequest) -> str | None:
     return _request_param_or_config_option_or_default(request, 'esp_flash_force', False)
 
 
+@pytest.fixture
+@multi_dut_argument
+def no_fast_flash(request: FixtureRequest) -> bool | None:
+    """Enable parametrization for the same cli option"""
+    return _request_param_or_config_option_or_default(request, 'no_fast_flash', None)
+
+
 @pytest.fixture
 @multi_dut_argument
 def build_dir(request: FixtureRequest) -> str | None:
@@ -1076,6 +1101,13 @@ def wokwi_diagram(request: FixtureRequest) -> str | None:
     return _request_param_or_config_option_or_default(request, 'wokwi_diagram', None)
 
 
+@pytest.fixture
+@multi_dut_argument
+def wokwi_usb_serial_jtag(request: FixtureRequest) -> bool | None:
+    """Enable parametrization for the same cli option"""
+    return _request_param_or_config_option_or_default(request, 'wokwi_usb_serial_jtag', None)
+
+
 ####################
 # Private Fixtures #
 ####################
@@ -1118,6 +1150,7 @@ def parametrize_fixtures(
     erase_all,
     esptool_baud,
     esp_flash_force,
+    no_fast_flash,
     part_tool,
     confirm_target_elf_sha256,
     erase_nvs,
@@ -1134,6 +1167,7 @@ def parametrize_fixtures(
     qemu_extra_args,
     qemu_efuse_path,
     wokwi_diagram,
+    wokwi_usb_serial_jtag,
     skip_regenerate_image,
     encrypt,
     keyfile,