pytest-regtest 2.3.3__tar.gz → 2.3.4__tar.gz

{pytest_regtest-2.3.3/src/pytest_regtest.egg-info → pytest_regtest-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-regtest
-Version: 2.3.3
+Version: 2.3.4
 Summary: pytest plugin for snapshot regression testing
 Author-email: Uwe Schmitt <uwe.schmitt@id.ethz.ch>
 License: MIT License
@@ -15,6 +15,28 @@ Classifier: License :: OSI Approved :: MIT License
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: pytest>7.2
+Provides-Extra: dev
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: hatchling; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: mkdocs; extra == "dev"
+Requires-Dist: mkdocs-material; extra == "dev"
+Requires-Dist: mistletoe; extra == "dev"
+Requires-Dist: mkdocs-awesome-pages-plugin; extra == "dev"
+Requires-Dist: jinja2-cli; extra == "dev"
+Requires-Dist: mkdocstrings[python]; extra == "dev"
+Requires-Dist: numpy>=2; extra == "dev"
+Requires-Dist: pandas>=2; extra == "dev"
+Requires-Dist: polars>=1.9; extra == "dev"
+Requires-Dist: md-transformer>=0.0.3; extra == "dev"
+Dynamic: license-file
 
 ![](https://gitlab.com/uweschmitt/pytest-regtest/badges/main/pipeline.svg)
 ![](https://gitlab.com/uweschmitt/pytest-regtest/badges/main/coverage.svg?job=coverage)

{pytest_regtest-2.3.3 → pytest_regtest-2.3.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytest-regtest"
-version = "2.3.3"
+version = "2.3.4"
 description = "pytest plugin for snapshot regression testing"
 readme = "README.md"
 authors = [
@@ -43,8 +43,8 @@ exclude = ["_regtest_output"]
 [tool.ruff.lint]
 ignore = ["E731", "E203"]
 
-[tool.uv]
-dev-dependencies = [
+[project.optional-dependencies]
+dev = [
     "twine", "build", "hatchling", "wheel", "pre-commit", "ruff", "black",
     "pytest-cov", "numpy", "pandas", "mkdocs", "mkdocs-material", "mistletoe",
     "mkdocs-awesome-pages-plugin", "jinja2-cli", "mkdocstrings[python]",

{pytest_regtest-2.3.3 → pytest_regtest-2.3.4}/src/pytest_regtest/__init__.py

@@ -18,7 +18,6 @@ from .register_third_party_handlers import (
     register_pandas_handler,
     register_polars_handler,
 )
-
 from .snapshot_handler import register_python_object_handler
 
 __version__ = _version(__package__)

{pytest_regtest-2.3.3 → pytest_regtest-2.3.4}/src/pytest_regtest/pytest_regtest.py

@@ -108,9 +108,6 @@ class PytestRegtestPlugin:
             if output_exception is not None:
                 raise output_exception
 
-        if item.get_closest_marker("xfail") and item.config.getvalue("--regtest-reset"):
-            # enforce consistency with xfail:
-            assert False
 
     def check_recorded_output(self, item):
         test_folder = item.fspath.dirname
@@ -127,6 +124,14 @@ class PytestRegtestPlugin:
         consider_line_endings = config.getvalue("--regtest-consider-line-endings")
         reset = config.getvalue("--regtest-reset")
 
+        # Skip reset for xfail tests that are actually expected to fail
+        xfail_marker = item.get_closest_marker("xfail")
+        if xfail_marker:
+            # Check if xfail condition evaluates to True
+            condition = xfail_marker.kwargs.get("condition", True)
+            if condition is True or (condition is not False and condition):
+                reset = False
+
         if reset:
             os.makedirs(os.path.dirname(recorded_output_path), exist_ok=True)
             with open(recorded_output_path + ".out", "w", encoding="utf-8") as fh:
@@ -252,9 +257,6 @@ class SnapshotPlugin:
             if snapshot_exception is not None:
                 raise snapshot_exception
 
-        if item.get_closest_marker("xfail") and item.config.getvalue("--regtest-reset"):
-            # enforce fail
-            assert False
 
     def check_snapshots(self, item):
         results = []
@@ -287,6 +289,14 @@ class SnapshotPlugin:
 
         reset = config.getvalue("--regtest-reset")
 
+        # Skip reset for xfail tests that are actually expected to fail
+        xfail_marker = item.get_closest_marker("xfail")
+        if xfail_marker:
+            # Check if xfail condition evaluates to True
+            condition = xfail_marker.kwargs.get("condition", True)
+            if condition is True or (condition is not False and condition):
+                reset = False
+
         if reset:
             os.makedirs(recorded_output_path, exist_ok=True)
             handler.save(recorded_output_path, obj)

{pytest_regtest-2.3.3 → pytest_regtest-2.3.4/src/pytest_regtest.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-regtest
-Version: 2.3.3
+Version: 2.3.4
 Summary: pytest plugin for snapshot regression testing
 Author-email: Uwe Schmitt <uwe.schmitt@id.ethz.ch>
 License: MIT License
@@ -15,6 +15,28 @@ Classifier: License :: OSI Approved :: MIT License
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: pytest>7.2
+Provides-Extra: dev
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: hatchling; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: mkdocs; extra == "dev"
+Requires-Dist: mkdocs-material; extra == "dev"
+Requires-Dist: mistletoe; extra == "dev"
+Requires-Dist: mkdocs-awesome-pages-plugin; extra == "dev"
+Requires-Dist: jinja2-cli; extra == "dev"
+Requires-Dist: mkdocstrings[python]; extra == "dev"
+Requires-Dist: numpy>=2; extra == "dev"
+Requires-Dist: pandas>=2; extra == "dev"
+Requires-Dist: polars>=1.9; extra == "dev"
+Requires-Dist: md-transformer>=0.0.3; extra == "dev"
+Dynamic: license-file
 
 ![](https://gitlab.com/uweschmitt/pytest-regtest/badges/main/pipeline.svg)
 ![](https://gitlab.com/uweschmitt/pytest-regtest/badges/main/coverage.svg?job=coverage)

pytest_regtest-2.3.4/src/pytest_regtest.egg-info/requires.txt

@@ -0,0 +1,23 @@
+pytest>7.2
+
+[dev]
+twine
+build
+hatchling
+wheel
+pre-commit
+ruff
+black
+pytest-cov
+numpy
+pandas
+mkdocs
+mkdocs-material
+mistletoe
+mkdocs-awesome-pages-plugin
+jinja2-cli
+mkdocstrings[python]
+numpy>=2
+pandas>=2
+polars>=1.9
+md-transformer>=0.0.3

{pytest_regtest-2.3.3 → pytest_regtest-2.3.4}/tests/test_regtest.py

@@ -135,11 +135,13 @@ def test_xfail(testdir, assert_outcomes):
     result = testdir.runpytest()
     assert_outcomes(result, xfailed=1)
 
+    # With --regtest-reset, xfail tests are not reset (output not recorded)
     result = testdir.runpytest("--regtest-reset")
     assert_outcomes(result, xfailed=1)
 
+    # Run again - still xfailed because no output was recorded
     result = testdir.runpytest()
-    assert_outcomes(result, xpassed=1)
+    assert_outcomes(result, xfailed=1)
 
 
 def test_xfail_strict(testdir, assert_outcomes):
@@ -161,11 +163,56 @@ def test_xfail_strict(testdir, assert_outcomes):
     result = testdir.runpytest()
     assert_outcomes(result, failed=0, passed=0, xfailed=1)
 
+    # With --regtest-reset, xfail tests are not reset (output not recorded)
     result = testdir.runpytest("--regtest-reset")
     assert_outcomes(result, xfailed=1)
 
+    # Run again - still xfailed because no output was recorded
+    # With strict=True, an xpass would become a failure, but this stays xfailed
     result = testdir.runpytest()
-    assert_outcomes(result, failed=1)
+    assert_outcomes(result, xfailed=1)
+
+
+def test_conditional_xfail(testdir, assert_outcomes):
+    testdir.makepyfile(
+        """
+        import sys
+        import pytest
+
+        @pytest.mark.xfail(condition=sys.platform == "win32", reason="Windows only")
+        def test_conditional_xfail_windows(regtest_all):
+            print("This test is xfailed on Windows only")
+            print(f"Platform: {sys.platform}")
+            # This should pass on non-Windows
+
+        @pytest.mark.xfail(condition=sys.platform != "win32", reason="Non-Windows only")
+        def test_conditional_xfail_non_windows(regtest_all):
+            print("This test is xfailed on non-Windows only")
+            print(f"Platform: {sys.platform}")
+            # This should pass on Windows
+         """
+    )
+
+    # Run initially - one should fail (no recorded output), one should xfail
+    result = testdir.runpytest()
+    assert_outcomes(result, failed=1, xfailed=1)
+
+    # Run with --regtest-reset
+    # xfail tests should NOT be reset - they run but output is not recorded
+    # The non-xfailed test gets reset, the xfailed one still fails (no output file)
+    result = testdir.runpytest("--regtest-reset")
+    if IS_WIN:
+        # On Windows: test_windows is xfailed, test_non_windows gets reset
+        assert_outcomes(result, passed=1, xfailed=1)
+    else:
+        # On non-Windows: test_windows gets reset, test_non_windows is xfailed
+        assert_outcomes(result, passed=1, xfailed=1)
+
+    # Run again to verify
+    # The non-xfailed test should pass (was reset)
+    # The xfailed test should still fail (no output file was created)
+    result = testdir.runpytest()
+    assert_outcomes(result, passed=1, xfailed=1)
 
 
 def test_failed_test(testdir, assert_outcomes):

pytest_regtest-2.3.3/src/pytest_regtest.egg-info/requires.txt

@@ -1 +0,0 @@
-pytest>7.2