pytest-regtest 2.2.0a2__py2.py3-none-any.whl → 2.2.1__py2.py3-none-any.whl

pytest_regtest/__init__.py

@@ -2,13 +2,22 @@ from importlib.metadata import version as _version
 
 import pytest
 
-from . import register_third_party_handlers  # noqa: F401
-from .pytest_regtest import PytestRegtestPlugin  # noqa: F401
-from .pytest_regtest import RegtestStream  # noqa: F401
 from .pytest_regtest import clear_converters  # noqa: F401
 from .pytest_regtest import patch_terminal_size  # noqa: F401
 from .pytest_regtest import register_converter_post  # noqa: F401
 from .pytest_regtest import register_converter_pre  # noqa: F401
+from .pytest_regtest import (
+    PytestRegtestCommonHooks,
+    PytestRegtestPlugin,
+    RegtestStream,
+    Snapshot,
+    SnapshotPlugin,
+)
+from .register_third_party_handlers import (
+    register_numpy_handler,
+    register_pandas_handler,
+)
+from .snapshot_handler import register_python_object_handler
 
 __version__ = _version(__package__)
 
@@ -43,12 +52,17 @@ def pytest_addoption(parser):
         "--regtest-disable-stdconv",
         action="store_true",
         default=False,
-        help="do not apply standard output converters to clean up indeterministic output",
+        help=(
+            "do not apply standard output converters to clean up indeterministic output"
+        ),
     )
 
 
 def pytest_configure(config):
-    config.pluginmanager.register(PytestRegtestPlugin())
+    common = PytestRegtestCommonHooks()
+    config.pluginmanager.register(common)
+    config.pluginmanager.register(PytestRegtestPlugin(common))
+    config.pluginmanager.register(SnapshotPlugin(common))
 
 
 @pytest.fixture
@@ -56,7 +70,9 @@ def regtest(request):
     yield RegtestStream(request)
 
 
-snapshot = regtest
+@pytest.fixture
+def snapshot(request):
+    yield Snapshot(request)
 
 
 @pytest.fixture
@@ -65,3 +81,19 @@ def regtest_all(regtest):
 
 
 snapshot_all_output = regtest_all
+
+register_python_object_handler()
+
+try:
+    import pandas  # noqa: F401
+
+    register_pandas_handler()
+except ImportError:
+    pass
+
+try:
+    import numpy  # noqa: F401
+
+    register_numpy_handler()
+except ImportError:
+    pass

pytest_regtest/numpy_handler.py

@@ -148,6 +148,7 @@ class NumpyHandler(BaseSnapshotHandler):
         self, current_obj, current_as_text, recorded_obj, recorded_as_text, has_markup
     ):
         sub_diff = []
+
         for i, (l1, l2, r1, r2) in enumerate(
             zip(current_as_text, recorded_as_text, current_obj, recorded_obj)
         ):
@@ -193,4 +194,16 @@ class NumpyHandler(BaseSnapshotHandler):
                 sub_diff.append(f"row {i:3d}: {l1}")
                 sub_diff.append(f"         {l2}")
 
+        missing = len(current_as_text) - len(recorded_as_text)
+        if missing > 0:
+            for i, row in enumerate(current_as_text[-missing:], len(recorded_as_text)):
+                # remove duplicate brackets
+                row = row.rstrip("]") + "]"
+                sub_diff.append(f"row {i:3d}: -{row.lstrip()}")
+        if missing < 0:
+            for i, row in enumerate(recorded_as_text[missing:], len(current_as_text)):
+                # remove duplicate brackets
+                row = row.rstrip("]") + "]"
+                sub_diff.append(f"row {i:3d}: +{row.lstrip()}")
+
         return sub_diff