pytest-regtest 2.0.2__tar.gz → 2.0.3__tar.gz

{pytest-regtest-2.0.2/pytest_regtest/pytest_regtest.egg-info → pytest-regtest-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-regtest
-Version: 2.0.2
+Version: 2.0.3
 Summary: "pytest plugin for snapshot regression testing"
 Author: Uwe Schmitt
 Author-email: uwe.schmitt@id.ethz.ch

{pytest-regtest-2.0.2 → pytest-regtest-2.0.3/pytest_regtest/pytest_regtest.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-regtest
-Version: 2.0.2
+Version: 2.0.3
 Summary: "pytest plugin for snapshot regression testing"
 Author: Uwe Schmitt
 Author-email: uwe.schmitt@id.ethz.ch

{pytest-regtest-2.0.2 → pytest-regtest-2.0.3}/pytest_regtest/pytest_regtest.py

@@ -1,4 +1,6 @@
 import difflib
+import functools
+import inspect
 import os
 import re
 import sys
@@ -250,7 +252,7 @@ class RegtestStream:
     def write(self, what):
         self.buffer.write(what)
 
-    def flush(self, true):
+    def flush(self):
         pass
 
     def get_lines(self):
@@ -303,13 +305,29 @@ _converters_pre = []
 _converters_post = []
 
 
+def _fix_pre_v2_converter_function(function):
+    @functools.wraps(function)
+    def fixed_converter_function(output, request):
+        return function(output)
+
+    return fixed_converter_function
+
+
 def register_converter_pre(function):
     if function not in _converters_pre:
+        signature = inspect.signature(function)
+        # keep downward compatibility:
+        if len(signature.parameters) == 1:
+            function = _fix_pre_v2_converter_function(function)
         _converters_pre.append(function)
 
 
 def register_converter_post(function):
     if function not in _converters_post:
+        signature = inspect.signature(function)
+        # keep downward compatibility:
+        if len(signature.parameters) == 1:
+            function = _fix_pre_v2_converter_function(function)
         _converters_post.append(function)
 
 

{pytest-regtest-2.0.2 → pytest-regtest-2.0.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pytest-regtest
-version = 2.0.2
+version = 2.0.3
 license = MIT
 description = "pytest plugin for snapshot regression testing"
 long_description = file: README.md

{pytest-regtest-2.0.2 → pytest-regtest-2.0.3}/tests/test_plugin.py

@@ -19,6 +19,7 @@ def create_test_regtest_context_manager(testdir):
                 print(tempfile.gettempdir())
                 print(tempfile.mkdtemp())
                 print("obj id is", hex(id(tempfile)))
+            regtest.flush()
 
          """
     )
@@ -39,6 +40,7 @@ def create_test_regtest_fh(testdir):
             print(tempfile.gettempdir(), file=regtest)
             print(tempfile.mkdtemp(), file=regtest)
             print("obj id is", hex(id(tempfile)), file=regtest)
+            regtest.flush()
 
          """
     )
@@ -149,6 +151,42 @@ def test_failed_test(testdir):
     result.assert_outcomes(failed=1)
 
 
+def test_converter_pre_pre_v2(testdir):
+    testdir.makepyfile(
+        """
+        import tempfile
+        from pytest_regtest import register_converter_pre
+
+        @register_converter_pre
+        def to_upper_conv(line):
+            return line.upper()
+
+        def test_regtest(regtest_all, tmpdir):
+            print("this is expected outcome")
+            print("obj id is 0xabcdeffff")
+         """
+    )
+    result = testdir.runpytest_subprocess()
+    result.assert_outcomes(failed=1)
+
+    expected_diff = """
+                    >   --- is
+                    >   +++ tobe
+                    >   @@ -1,2 +0,0 @@
+                    >   -THIS IS EXPECTED OUTCOME
+                    >   -OBJ ID IS 0XABCDEFFFF
+                    """.strip().split(
+        "\n"
+    )
+
+    result.stdout.fnmatch_lines(
+        [line.lstrip() for line in expected_diff], consecutive=True
+    )
+
+    result = testdir.runpytest("--regtest-reset")
+    result.assert_outcomes(passed=1)
+
+
 def test_converter_pre(testdir):
     testdir.makepyfile(
         """
@@ -185,6 +223,48 @@ def test_converter_pre(testdir):
     result.assert_outcomes(passed=1)
 
 
+def test_converter_post_pre_v2(testdir):
+    testdir.makepyfile(
+        """
+        import tempfile
+        from pytest_regtest import register_converter_post
+
+        @register_converter_post
+        def to_upper_conv(line):
+            return line.upper()
+
+        def test_regtest(regtest_all, tmpdir):
+            print("this is expected outcome")
+            print(tmpdir.join("test").strpath)
+            print(tempfile.gettempdir())
+            print(tempfile.mkdtemp())
+            print("obj id is", hex(id(tempfile)))
+         """
+    )
+    result = testdir.runpytest_subprocess()
+    result.assert_outcomes(failed=1)
+
+    expected_diff = """
+                    >   --- is
+                    >   +++ tobe
+                    >   @@ -1,5 +0,0 @@
+                    >   -THIS IS EXPECTED OUTCOME
+                    >   -<TMPDIR_FROM_FIXTURE>/TEST
+                    >   -<TMPDIR_FROM_TEMPFILE_MODULE>
+                    >   -<TMPDIR_FROM_TEMPFILE_MODULE>
+                    >   -OBJ ID IS 0X?????????
+                    """.strip().split(
+        "\n"
+    )
+
+    result.stdout.fnmatch_lines(
+        [line.lstrip() for line in expected_diff], consecutive=True
+    )
+
+    result = testdir.runpytest("--regtest-reset")
+    result.assert_outcomes(passed=1)
+
+
 def test_converter_post(testdir):
     testdir.makepyfile(
         """
@@ -227,6 +307,7 @@ def test_converter_post(testdir):
     result.assert_outcomes(passed=1)
 
 
+
 def test_consider_line_endings(create_test_regtest_fh):
     create_test_regtest_fh.runpytest("--regtest-reset")