Add tests and fix edge cases

Author: cdce8p

pylint/testutils/functional/test_file.py

@@ -9,7 +9,9 @@
 from collections.abc import Callable
 from os.path import basename, exists, join, split
 from pathlib import Path
-from typing import TypedDict
+from typing import Final, TypedDict
+
+_CURRENT_VERSION: Final = sys.version_info[:2]
 
 
 def parse_python_version(ver_str: str) -> tuple[int, ...]:
@@ -105,14 +107,15 @@ def expected_output(self) -> str:
             p.stem
             for p in Path(self._directory).glob(f"{split(self.base)[-1]}.[0-9]*.txt")
         ]
-        # pylint: disable-next=bad-builtin
-        current_version = int("".join(map(str, sys.version_info[:2])))
         output_options = [
-            int(version) for s in files if (version := s.rpartition(".")[2]).isalnum()
+            (int(version[0]), int(version[1:]))
+            for s in files
+            if (version := s.rpartition(".")[2]).isalnum()
         ]
         for opt in sorted(output_options, reverse=True):
-            if current_version >= opt:
-                return join(self._directory, f"{self.base}.{opt}.txt")
+            if _CURRENT_VERSION >= opt:
+                str_opt = "".join([str(s) for s in opt])
+                return join(self._directory, f"{self.base}.{str_opt}.txt")
         return join(self._directory, self.base + ".txt")
 
     @property

tests/testutils/test_functional_testutils.py

@@ -4,8 +4,13 @@
 
 """Tests for the functional test framework."""
 
+import contextlib
+import os
+import shutil
+import tempfile
+from collections.abc import Iterator
 from pathlib import Path
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch
 
 import pytest
 from _pytest.outcomes import Skipped
@@ -20,6 +25,26 @@
 DATA_DIRECTORY = HERE / "data"
 
 
+@contextlib.contextmanager
+def tempdir() -> Iterator[str]:
+    """Create a temp directory and change the current location to it.
+
+    This is supposed to be used with a *with* statement.
+    """
+    tmp = tempfile.mkdtemp()
+
+    # Get real path of tempfile, otherwise test fail on mac os x
+    current_dir = os.getcwd()
+    os.chdir(tmp)
+    abs_tmp = os.path.abspath(".")
+
+    try:
+        yield abs_tmp
+    finally:
+        os.chdir(current_dir)
+        shutil.rmtree(abs_tmp)
+
+
 @pytest.fixture(name="pytest_config")
 def pytest_config_fixture() -> MagicMock:
     def _mock_getoption(option: str) -> bool:
@@ -69,6 +94,37 @@ def test_get_functional_test_files_from_crowded_directory() -> None:
     assert "max_overflow" not in str(exc_info.value)
 
 
+@pytest.mark.parametrize(
+    ["files", "output_file_name"],
+    [
+        ([], "file.txt"),
+        (["file.txt"], "file.txt"),
+        (["file.314.txt"], "file.txt"),  # don't match 3.14
+        (["file.42.txt"], "file.txt"),  # don't match 4.2
+        (["file.32.txt", "file.txt"], "file.32.txt"),
+        (["file.312.txt", "file.txt"], "file.312.txt"),
+        (["file.313.txt", "file.txt"], "file.313.txt"),
+        (["file.310.txt", "file.313.txt", "file.312.txt", "file.txt"], "file.313.txt"),
+        # don't match other test file names accidentally
+        ([".file.313.txt"], "file.txt"),
+        (["file_other.313.txt"], "file.txt"),
+        (["other_file.313.txt"], "file.txt"),
+    ],
+)
+def test_expected_output_file_matching(files: list[str], output_file_name: str) -> None:
+    """Test output file matching. Pin current Python version to 3.13."""
+    with tempdir():
+        for file in files:
+            with open(file, "w", encoding="utf-8"):
+                ...
+        test_file = FunctionalTestFile(".", "file.py")
+        with patch(
+            "pylint.testutils.functional.test_file._CURRENT_VERSION",
+            new=(3, 13),
+        ):
+            assert test_file.expected_output == f"./{output_file_name}"
+
+
 def test_minimal_messages_config_enabled(pytest_config: MagicMock) -> None:
     """Test that all messages not targeted in the functional test are disabled
     when running with --minimal-messages-config.