changed conflicting formatter fixture

Author: jspaezp

tests/test_conflicting_formatters.py

@@ -1,36 +1,34 @@
 from __future__ import annotations
 
 from collections.abc import Generator
+from contextlib import contextmanager
 from pathlib import Path
 
 import pytest
-from _pytest.fixtures import SubRequest
 
 from pydocstringformatter import _formatting
 from pydocstringformatter import _testutils as test_utils
+from pydocstringformatter._formatting import Formatter
 from pydocstringformatter._utils import UnstableResultError
 from pydocstringformatter.run import _Run
 
 
-@pytest.fixture(scope="function")
-def patched_run(request: SubRequest) -> Generator[type[_Run], None, None]:
-    """Patches the _Run class to use the MakeAFormatter and MakeBFormatter."""
+@contextmanager
+def patched_run(formatters: list[Formatter]) -> Generator[type[_Run], None, None]:
+    """Patches the _Run class to use only the provided formatters."""
     # This monkeypatches the formatters to make them conflict.
     # and the only formatters applied
 
     old_formatters = _formatting.FORMATTERS
-    _formatting.FORMATTERS = request.param
-
-    def cleanup() -> None:
-        """Returns the formatters to their original state."""
+    try:
+        _formatting.FORMATTERS = formatters
+        yield _Run
+    finally:
         _formatting.FORMATTERS = old_formatters
 
-    yield _Run
-    cleanup()
-
 
 @pytest.mark.parametrize(
-    "patched_run,expect_errors",
+    "formatters,expected_errors",
     [
         (
             [test_utils.MakeAFormatter(), test_utils.MakeBFormatter()],
@@ -49,11 +47,10 @@ def cleanup() -> None:
             ["Conflicting formatters:", "Diff too intricate to compute"],
         ),
     ],
-    indirect=["patched_run"],
 )
 def test_conflicting_formatters(
-    patched_run: type[_Run],  # pylint: disable=redefined-outer-name
-    expect_errors: list[str],
+    formatters: list[Formatter],  # pylint: disable=redefined-outer-name
+    expected_errors: list[str],
     tmp_path: Path,
 ) -> None:
     """Tests that conflicting formatters raise an error."""
@@ -64,8 +61,9 @@ def test_conflicting_formatters(
         ]
         f.writelines(content)
 
-    with pytest.raises(UnstableResultError) as err:
-        patched_run([str(tmp_file)])
+    with patched_run(formatters) as run:
+        with pytest.raises(UnstableResultError) as err:
+            run([str(tmp_file)])
 
-    for expect_err in expect_errors:
+    for expect_err in expected_errors:
         assert expect_err in str(err.value), str(err.value)