tests: add cache_toml kwarg to _cli.run for tests to disable TOML caching

Author: hukkin

src/mdformat/_cli.py

@@ -24,7 +24,7 @@ def emit(self, record: logging.LogRecord) -> None:
             sys.stderr.write(f"Warning: {record.msg}\n")
 
 
-def run(cli_args: Sequence[str]) -> int:  # noqa: C901
+def run(cli_args: Sequence[str], cache_toml: bool = True) -> int:  # noqa: C901
     arg_parser = make_arg_parser(
         mdformat.plugins._PARSER_EXTENSION_DISTS,
         mdformat.plugins._CODEFORMATTER_DISTS,
@@ -47,8 +47,9 @@ def run(cli_args: Sequence[str]) -> int:  # noqa: C901
     format_errors_found = False
     renderer_warning_printer = RendererWarningPrinter()
     for path in file_paths:
+        read_toml = read_toml_opts if cache_toml else read_toml_opts.__wrapped__
         try:
-            toml_opts, toml_path = read_toml_opts(path.parent if path else Path.cwd())
+            toml_opts, toml_path = read_toml(path.parent if path else Path.cwd())
         except InvalidConfError as e:
             print_error(str(e))
             return 1

tests/test_config_file.py

@@ -5,7 +5,7 @@
 import pytest
 
 from mdformat._cli import run
-from tests.utils import FORMATTED_MARKDOWN, UNFORMATTED_MARKDOWN, run_with_clear_cache
+from tests.utils import FORMATTED_MARKDOWN, UNFORMATTED_MARKDOWN
 
 
 def test_cli_override(tmp_path):
@@ -97,7 +97,7 @@ def test_conf_with_stdin(tmp_path, capfd, monkeypatch):
     monkeypatch.setattr(sys, "stdin", StringIO("1. one\n1. two\n1. three"))
 
     with mock.patch("mdformat._cli.Path.cwd", return_value=tmp_path):
-        assert run_with_clear_cache(("-",)) == 0
+        assert run(("-",), cache_toml=False) == 0
     captured = capfd.readouterr()
     assert captured.out == "1. one\n2. two\n3. three\n"
 
@@ -161,11 +161,11 @@ def test_conf_no_validate(tmp_path):
         "mdformat.renderer._context.get_list_marker_type",
         return_value="?",
     ):
-        assert run_with_clear_cache((str(file_path),)) == 1
+        assert run((str(file_path),), cache_toml=False) == 1
         assert file_path.read_text() == content
 
         config_path = tmp_path / ".mdformat.toml"
         config_path.write_text("validate = false")
 
-        assert run_with_clear_cache((str(file_path),)) == 0
+        assert run((str(file_path),), cache_toml=False) == 0
         assert file_path.read_text() == "1? ordered\n"

tests/test_plugins.py

@@ -22,7 +22,6 @@
     SuffixPostprocessPlugin,
     TablePlugin,
     TextEditorPlugin,
-    run_with_clear_cache,
 )
 
 
@@ -444,7 +443,7 @@ def test_no_codeformatters__toml(tmp_path, monkeypatch):
     file1_path.write_text(unformatted)
     config_path = tmp_path / ".mdformat.toml"
     config_path.write_text("codeformatters = []")
-    assert run_with_clear_cache((str(tmp_path),)) == 0
+    assert run((str(tmp_path),), cache_toml=False) == 0
     assert file1_path.read_text() == unformatted
 
 
@@ -464,5 +463,5 @@ def test_no_extensions__toml(tmp_path, monkeypatch):
     file1_path.write_text(unformatted)
     config_path = tmp_path / ".mdformat.toml"
     config_path.write_text("extensions = []")
-    assert run_with_clear_cache((str(tmp_path),)) == 0
+    assert run((str(tmp_path),), cache_toml=False) == 0
     assert file1_path.read_text() == unformatted

tests/utils.py

@@ -3,8 +3,6 @@
 import json
 from typing import TYPE_CHECKING
 
-from mdformat._cli import run
-from mdformat._conf import read_toml_opts
 from mdformat.renderer import RenderContext, RenderTreeNode
 
 if TYPE_CHECKING:
@@ -14,11 +12,6 @@
 FORMATTED_MARKDOWN = "# A header\n"
 
 
-def run_with_clear_cache(*args, **kwargs):
-    read_toml_opts.cache_clear()
-    return run(*args, **kwargs)
-
-
 class JSONFormatterPlugin:
     """A code formatter plugin that formats JSON."""