Fix tests

Author: cdce8p

pylint/testutils/functional/find_functional_tests.py

@@ -15,7 +15,7 @@
 directory.
 
 'Wet finger' as in 'in my settings there are precisely this many'.
-Initially the total number of file then we started counting only the python files to
+Initially the total number of files then we started counting only the python files to
 avoid moving a lot of files.
 """
 
@@ -75,7 +75,7 @@ def _get_files_from_dir(
         files_without_leading_underscore = list(
             p
             for p in path.iterdir()
-            if not p.stem.startswith("_") and p.suffix == ".py"
+            if not (p.stem.startswith("_") or (p.is_file() and p.suffix != ".py"))
         )
         if len(files_without_leading_underscore) > max_file_per_directory:
             violations.append((path, len(files_without_leading_underscore)))
@@ -90,7 +90,6 @@ def walk(path: Path) -> Iterator[Path]:
         )
         for _file_or_dir in parent_dir_files:
             if _file_or_dir.is_dir():
-                _files = _get_files_from_dir(_file_or_dir, violations)
                 yield _file_or_dir.resolve()
                 try:
                     yield from walk(_file_or_dir)

tests/testutils/data/m/max_overflow/max_overflow_3.py

@@ -85,13 +85,14 @@ def test_get_functional_test_files_from_crowded_directory() -> None:
         get_functional_test_files_from_directory(
             DATA_DIRECTORY / "m", max_file_per_directory=1
         )
-    assert exc_info.match("m: 4 when the max is 1")
-    assert exc_info.match("max_overflow: 3 when the max is 1")
+    assert exc_info.match("m: 3 when the max is 1")
+    assert exc_info.match("max_overflow: 2 when the max is 1")
+    assert len(exc_info.value.args[0].splitlines()) == 3
     with pytest.raises(AssertionError) as exc_info:
         get_functional_test_files_from_directory(
-            DATA_DIRECTORY / "m", max_file_per_directory=3
+            DATA_DIRECTORY / "m", max_file_per_directory=2
         )
-    assert exc_info.match("m: 4 when the max is 3")
+    assert exc_info.match("m: 3 when the max is 2")
     assert "max_overflow" not in str(exc_info.value)