fix tests; avoid skipped file exploration

pylint/lint/pylinter.py

@@ -615,39 +615,31 @@ def initialize(self) -> None:
             if not msg.may_be_emitted(self.config.py_version):
                 self._msgs_state[msg.msgid] = False
 
-    def _discover_files(
-        self, files_or_modules: Sequence[str], all_files: bool = False
-    ) -> Iterator[str]:
+    def _discover_files(self, files_or_modules: Sequence[str]) -> Iterator[str]:
         """Discover python modules and packages in sub-directory.
 
-        :param Sequence[str] files_or_modules: list of directories to explore
-        :param str all_files: whether to return _all_ files, entering modules
-                              and not considering ignored paths
         Returns iterator of paths to discovered modules and packages.
         """
         for something in files_or_modules:
-            if os.path.isdir(something):
-                if not all_files and not os.path.isfile(
-                    os.path.join(something, "__init__.py")
-                ):
-                    continue
+            if os.path.isdir(something) and not os.path.isfile(
+                os.path.join(something, "__init__.py")
+            ):
                 skip_subtrees: list[str] = []
                 for root, _, files in os.walk(something):
                     if any(root.startswith(s) for s in skip_subtrees):
                         # Skip subtree of already discovered package.
                         continue
 
-                    if not all_files and _is_ignored_file(
+                    if _is_ignored_file(
                         root,
                         self.config.ignore,
                         self.config.ignore_patterns,
                         self.config.ignore_paths,
                     ):
-                        self.skipped_paths.add(root)
                         skip_subtrees.append(root)
                         continue
 
-                    if not all_files and "__init__.py" in files:
+                    if "__init__.py" in files:
                         skip_subtrees.append(root)
                         yield root
                     else:
@@ -1156,11 +1148,8 @@ def _report_evaluation(self, verbose: bool = False) -> int | None:
 
             if verbose:
                 checked_files_count = self.stats.node_count["module"]
-                skipped_files = list(
-                    self._discover_files(list(self.skipped_paths), all_files=True)
-                )
-                skipped_files_count = len(skipped_files)
-                msg += f"\nChecked {checked_files_count} files, skipped {skipped_files_count} files"
+                skipped_paths_count = len(self.skipped_paths)
+                msg += f"\nChecked {checked_files_count} files, skipped {skipped_paths_count} files/modules"
 
         if self.config.score:
             sect = report_nodes.EvaluationSection(msg)

tests/lint/unittest_expand_modules.py

@@ -40,6 +40,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": True,
     "name": "lint.unittest_expand_modules",
     "path": EXPAND_MODULES,
+    "isignored": False,
 }
 
 this_file_relative_to_parent = {
@@ -48,6 +49,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": True,
     "name": "lint.unittest_expand_modules",
     "path": EXPAND_MODULES_BASE,
+    "isignored": False,
 }
 
 this_file_from_init = {
@@ -56,6 +58,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": False,
     "name": "lint.unittest_expand_modules",
     "path": EXPAND_MODULES,
+    "isignored": False,
 }
 
 this_file_from_init_deduplicated = {
@@ -64,6 +67,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": True,
     "name": "lint.unittest_expand_modules",
     "path": EXPAND_MODULES,
+    "isignored": False,
 }
 
 unittest_lint = {
@@ -72,6 +76,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": False,
     "name": "lint.unittest_lint",
     "path": str(TEST_DIRECTORY / "lint/unittest_lint.py"),
+    "isignored": False,
 }
 
 test_utils = {
@@ -80,6 +85,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": False,
     "name": "lint.test_utils",
     "path": str(TEST_DIRECTORY / "lint/test_utils.py"),
+    "isignored": False,
 }
 
 test_run_pylint = {
@@ -88,6 +94,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": False,
     "name": "lint.test_run_pylint",
     "path": str(TEST_DIRECTORY / "lint/test_run_pylint.py"),
+    "isignored": False,
 }
 
 test_pylinter = {
@@ -96,6 +103,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": False,
     "name": "lint.test_pylinter",
     "path": str(TEST_DIRECTORY / "lint/test_pylinter.py"),
+    "isignored": False,
 }
 
 test_caching = {
@@ -104,6 +112,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": False,
     "name": "lint.test_caching",
     "path": str(TEST_DIRECTORY / "lint/test_caching.py"),
+    "isignored": False,
 }
 
 init_of_package = {
@@ -112,6 +121,7 @@ def test__is_in_ignore_list_re_match() -> None:
     "isarg": True,
     "name": "lint",
     "path": INIT_PATH,
+    "isignored": False,
 }
 
 # A directory that is not a python package.
@@ -123,13 +133,15 @@ def test__is_in_ignore_list_re_match() -> None:
         "isarg": False,
         "basepath": str(REPORTERS_PATH / "__init__.py"),
         "basename": "reporters",
+        "isignored": False,
     },
     str(REPORTERS_PATH / "unittest_reporting.py"): {
         "path": str(REPORTERS_PATH / "unittest_reporting.py"),
         "name": "reporters.unittest_reporting",
         "isarg": False,
         "basepath": str(REPORTERS_PATH / "__init__.py"),
         "basename": "reporters",
+        "isignored": False,
     },
 }
 
@@ -304,5 +316,5 @@ def test_expand_modules_with_ignore(
             ignore_list_re,
             self.linter.config.ignore_paths,
         )
-        assert modules == expected
+        assert {k: v for k, v in modules.items() if not v["isignored"]} == expected
         assert not errors

tests/test_self.py

@@ -257,7 +257,7 @@ def test_output_with_verbose(self) -> None:
             out=out,
             code=4,
         )
-        assert "Checked 1 files, skipped 1 files" in out.getvalue().strip()
+        assert "Checked 1 files, skipped 1 files/modules" in out.getvalue().strip()
 
     def test_no_out_encoding(self) -> None:
         """Test redirection of stdout with non ascii characters."""