pytest-embedded 2.0.0a1__tar.gz → 2.1.1__tar.gz

{pytest_embedded-2.0.0a1 → pytest_embedded-2.1.1}/PKG-INFO

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

{pytest_embedded-2.0.0a1 → pytest_embedded-2.1.1}/pytest_embedded/__init__.py

@@ -6,4 +6,4 @@ from .dut_factory import DutFactory
 
 __all__ = ['App', 'Dut', 'DutFactory']
 
-__version__ = '2.0.0a1'
+__version__ = '2.1.1'

{pytest_embedded-2.0.0a1 → pytest_embedded-2.1.1}/pytest_embedded/dut_factory.py

@@ -138,6 +138,7 @@ def _fixture_classes_and_options_fn(
     qemu_prog_path,
     qemu_cli_args,
     qemu_extra_args,
+    qemu_efuse_path,
     wokwi_diagram,
     skip_regenerate_image,
     encrypt,
@@ -172,6 +173,7 @@ def _fixture_classes_and_options_fn(
                             'encrypt': encrypt,
                             'keyfile': keyfile,
                             'qemu_prog_path': qemu_prog_path,
+                            'qemu_efuse_path': qemu_efuse_path,
                         }
                     )
                 else:
@@ -303,6 +305,7 @@ def _fixture_classes_and_options_fn(
                     'qemu_prog_path': qemu_prog_path,
                     'qemu_cli_args': qemu_cli_args,
                     'qemu_extra_args': qemu_extra_args,
+                    'qemu_efuse_path': qemu_efuse_path,
                     'app': None,
                     'meta': _meta,
                     'dut_index': dut_index,
@@ -674,6 +677,7 @@ class DutFactory:
         qemu_prog_path: str | None = None,
         qemu_cli_args: str | None = None,
         qemu_extra_args: str | None = None,
+        qemu_efuse_path: str | None = None,
         wokwi_diagram: str | None = None,
         skip_regenerate_image: bool | None = None,
         encrypt: bool | None = None,
@@ -720,6 +724,7 @@ class DutFactory:
             qemu_prog_path: QEMU program path.
             qemu_cli_args: QEMU CLI arguments.
             qemu_extra_args: Additional QEMU arguments.
+            qemu_efuse_path: Efuse binary path.
             wokwi_diagram: Wokwi diagram path.
             skip_regenerate_image: Skip image regeneration flag.
             encrypt: Encryption flag.
@@ -787,6 +792,7 @@ class DutFactory:
                 'qemu_prog_path': qemu_prog_path,
                 'qemu_cli_args': qemu_cli_args,
                 'qemu_extra_args': qemu_extra_args,
+                'qemu_efuse_path': qemu_efuse_path,
                 'wokwi_diagram': wokwi_diagram,
                 'skip_regenerate_image': skip_regenerate_image,
                 'encrypt': encrypt,

{pytest_embedded-2.0.0a1 → pytest_embedded-2.1.1}/pytest_embedded/plugin.py

@@ -274,6 +274,10 @@ def pytest_addoption(parser):
         '--qemu-extra-args',
         help='QEMU cli extra arguments, will append to the argument list. (Default: None)',
     )
+    qemu_group.addoption(
+        '--qemu-efuse-path',
+        help='This option makes it possible to use efuse in QEMU when it is set up.',
+    )
     qemu_group.addoption(
         '--skip-regenerate-image',
         help='y/yes/true for True and n/no/false for False. '
@@ -963,6 +967,13 @@ def qemu_extra_args(request: FixtureRequest) -> str | None:
     return _request_param_or_config_option_or_default(request, 'qemu_extra_args', None)
 
 
+@pytest.fixture
+@multi_dut_argument
+def qemu_efuse_path(request: FixtureRequest) -> str | None:
+    """Enable parametrization for the same cli option"""
+    return _request_param_or_config_option_or_default(request, 'qemu_efuse_path', None)
+
+
 @pytest.fixture
 @multi_dut_argument
 def skip_regenerate_image(request: FixtureRequest) -> str | None:
@@ -1050,6 +1061,7 @@ def parametrize_fixtures(
     qemu_prog_path,
     qemu_cli_args,
     qemu_extra_args,
+    qemu_efuse_path,
     wokwi_diagram,
     skip_regenerate_image,
     encrypt,

{pytest_embedded-2.0.0a1 → pytest_embedded-2.1.1}/tests/test_base.py

@@ -283,11 +283,51 @@ def test_expect(testdir):
                 dut.expect(pattern_list, expect_all=True, timeout=1)
 
             assert e.value.value.startswith('Not found "[\'foobar\']"')
+
+        def test_expect_no_matching_list(dut):  # fail
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect('world!', not_matching=[re.compile("Hell"), "Hello"])
+
+        def test_expect_no_matching_word(dut):  # fail
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect('Restarting', not_matching="Hello world!")
+
+        def test_expect_no_matching_word_pass(dut):
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect('Restarting', not_matching="Hello world!333")
+
+        def test_expect_no_matching_word_pass_rest(dut):
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect('Hello world', not_matching="Restarting")
+
+        def test_expect_exact_no_matching_list(dut):  # fail
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect_exact('world!', not_matching=["Hell1", "Hello"])
+
+        def test_expect_exact_no_matching_word(dut):  # fail
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect_exact('Restarting', not_matching="Hello world!")
+
+        def test_expect_exact_no_matching_word_pass(dut):
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect_exact('Restarting', not_matching="Hello world!333")
+
+        def test_expect_exact_no_matching_word_pass_rest(dut):
+            dut.write('Hello world!')
+            dut.write('Restarting')
+            dut.expect_exact('Hello world', not_matching="Restarting")
     """)
 
     result = testdir.runpytest()
 
-    result.assert_outcomes(passed=10)
+    result.assert_outcomes(failed=4, passed=14)
 
 
 def test_expect_from_timeout(testdir):