pytest-embedded 1.4.2__tar.gz → 1.6.0__tar.gz

{pytest_embedded-1.4.2 → pytest_embedded-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-embedded
-Version: 1.4.2
+Version: 1.6.0
 Summary: A pytest plugin that designed for embedded testing.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=3.7
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Testing
 Requires-Dist: pytest>=7.0

{pytest_embedded-1.4.2 → pytest_embedded-1.6.0}/pyproject.toml

@@ -20,6 +20,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python",
     "Topic :: Software Development :: Testing",
 ]

{pytest_embedded-1.4.2 → pytest_embedded-1.6.0}/pytest_embedded/__init__.py

@@ -5,4 +5,4 @@ from .dut import Dut
 
 __all__ = ['App', 'Dut']
 
-__version__ = '1.4.2'
+__version__ = '1.6.0'

{pytest_embedded-1.4.2 → pytest_embedded-1.6.0}/pytest_embedded/plugin.py

@@ -193,7 +193,7 @@ def pytest_addoption(parser):
     idf_group.addoption(
         '--panic-output-decode-script',
         help='Panic output decode script that is used in conjunction with the check-panic-coredump option '
-        'to parse panic output. (Default: $IDF_PATH/tools/gdb_panic_server.py)',
+        'to parse panic output. (Default: use gdb_panic_server.py from package esp_idf_panic_decoder)',
     )
 
     jtag_group = parser.getgroup('embedded-jtag')
@@ -1088,6 +1088,7 @@ def _fixture_classes_and_options(
                             'skip_regenerate_image': skip_regenerate_image,
                             'encrypt': encrypt,
                             'keyfile': keyfile,
+                            'qemu_prog_path': qemu_prog_path,
                         }
                     )
                 else:
@@ -1204,6 +1205,7 @@ def _fixture_classes_and_options(
                     'qemu_extra_args': qemu_extra_args,
                     'app': None,
                     'meta': _meta,
+                    'dut_index': dut_index,
                 }
         elif fixture == 'wokwi':
             if 'wokwi' in _services:
@@ -1228,6 +1230,12 @@ def _fixture_classes_and_options(
                 'test_case_name': test_case_name,
                 'meta': _meta,
             }
+            if 'idf' in _services and 'esp' not in _services:
+                # esp,idf will use IdfDut, which based on IdfUnityDutMixin already
+                from pytest_embedded_idf.unity_tester import IdfUnityDutMixin
+
+                mixins[fixture].append(IdfUnityDutMixin)
+
             if 'wokwi' in _services:
                 from pytest_embedded_wokwi import WokwiDut
 
@@ -1239,15 +1247,12 @@ def _fixture_classes_and_options(
                 )
 
                 if 'idf' in _services:
-                    from pytest_embedded_idf.unity_tester import IdfUnityDutMixin
                     from pytest_embedded_wokwi.idf import IDFFirmwareResolver
 
                     kwargs['wokwi'].update({'firmware_resolver': IDFFirmwareResolver()})
-
-                    mixins[fixture].append(IdfUnityDutMixin)
                 else:
                     raise SystemExit('wokwi service should be used together with idf service')
-            if 'qemu' in _services:
+            elif 'qemu' in _services:
                 from pytest_embedded_qemu import QemuDut
 
                 classes[fixture] = QemuDut
@@ -1256,11 +1261,6 @@ def _fixture_classes_and_options(
                         'qemu': None,
                     }
                 )
-
-                if 'idf' in _services:
-                    from pytest_embedded_idf.unity_tester import IdfUnityDutMixin
-
-                    mixins[fixture].append(IdfUnityDutMixin)
             elif 'jtag' in _services:
                 if 'idf' in _services:
                     from pytest_embedded_idf import IdfDut
@@ -1409,18 +1409,18 @@ def dut(
     A device under test (DUT) object that could gather output from various sources and redirect them to the pexpect
     process, and run `expect()` via its pexpect process.
     """
+    kwargs = _fixture_classes_and_options.kwargs['dut']
+    mixins = _fixture_classes_and_options.mixins['dut']
+
+    # since there's no way to know the target before setup finished
+    # we have to use the `app.target` to determine the dut class here
     if hasattr(app, 'target') and app.target == 'linux':
         from pytest_embedded_idf import LinuxDut
 
         cls = LinuxDut
-        kwargs = _fixture_classes_and_options.kwargs['dut']
-        kwargs['serial'] = serial
-
-        return cls(**kwargs)
-
-    cls = _fixture_classes_and_options.classes['dut']
-    mixins = _fixture_classes_and_options.mixins['dut']
-    kwargs = _fixture_classes_and_options.kwargs['dut']
+        kwargs['serial'] = None  # replace it later with LinuxSerial
+    else:
+        cls = _fixture_classes_and_options.classes['dut']
 
     for k, v in kwargs.items():
         if v is None: