Merge pull request #116 from r1chardj0n3s/remove-logging-mock

Remove monkeypatch use from test_find_extra_reqs

Author: adamtheturtle

tests/test_find_extra_reqs.py

@@ -5,12 +5,10 @@
 import logging
 import textwrap
 from pathlib import Path
-from typing import Any, Callable, Iterable, List, Union
+from typing import Any, Set
 
 import pretend
 import pytest
-from pip._internal.req.req_file import ParsedRequirement
-from pytest import MonkeyPatch
 
 from pip_check_reqs import common, find_extra_reqs
 
@@ -96,47 +94,28 @@ def test_main_no_spec(capsys: pytest.CaptureFixture[Any]) -> None:
 
 
 @pytest.mark.parametrize(
-    ["verbose_cfg", "debug_cfg", "result"],
+    ["verbose_cfg", "debug_cfg", "expected_log_levels"],
     [
-        (False, False, ["warn"]),
-        (True, False, ["info", "warn"]),
-        (False, True, ["debug", "info", "warn"]),
-        (True, True, ["debug", "info", "warn"]),
+        (False, False, {logging.WARNING}),
+        (True, False, {logging.INFO, logging.WARNING}),
+        (False, True, {logging.DEBUG, logging.INFO, logging.WARNING}),
+        (True, True, {logging.DEBUG, logging.INFO, logging.WARNING}),
     ],
 )
 def test_logging_config(
-    monkeypatch: MonkeyPatch,
     caplog: pytest.LogCaptureFixture,
     verbose_cfg: bool,
     debug_cfg: bool,
-    result: List[str],
+    expected_log_levels: Set[int],
     tmp_path: Path,
 ) -> None:
     source_dir = tmp_path / "source"
     source_dir.mkdir()
 
-    def fake_find_extra_reqs(
-        requirements_filename: str,  # pylint: disable=unused-argument
-        paths: Iterable[str],  # pylint: disable=unused-argument
-        ignore_files_function: Callable[  # pylint: disable=unused-argument
-            [str], bool
-        ],
-        ignore_modules_function: Callable[  # pylint: disable=unused-argument
-            [str], bool
-        ],
-        ignore_requirements_function: Callable[  # noqa: E501 pylint: disable=unused-argument
-            [Union[str, ParsedRequirement]], bool
-        ],
-        skip_incompatible: bool,  # pylint: disable=unused-argument
-    ) -> List[str]:
-        return []
-
-    monkeypatch.setattr(
-        find_extra_reqs,
-        "find_extra_reqs",
-        fake_find_extra_reqs,
-    )
-    arguments = [str(source_dir)]
+    requirements_file = tmp_path / "requirements.txt"
+    requirements_file.touch()
+
+    arguments = [str(source_dir), "--requirements", str(requirements_file)]
     if verbose_cfg:
         arguments.append("--verbose")
     if debug_cfg:
@@ -151,12 +130,8 @@ def fake_find_extra_reqs(
     ]:
         find_extra_reqs.log.log(*event)
 
-    messages = [r.message for r in caplog.records]
-    # first message is always the usage message
-    if verbose_cfg or debug_cfg:
-        assert messages[1:] == result
-    else:
-        assert messages == result
+    log_levels = {r.levelno for r in caplog.records}
+    assert log_levels == expected_log_levels
 
 
 def test_main_version(capsys: pytest.CaptureFixture[Any]) -> None:

tests/test_find_missing_reqs.py

@@ -6,11 +6,10 @@
 import os
 import textwrap
 from pathlib import Path
-from typing import Any, Callable, Iterable, List, Tuple
+from typing import Any, Set
 
 import pretend
 import pytest
-from pytest import MonkeyPatch
 
 from pip_check_reqs import common, find_missing_reqs
 
@@ -115,42 +114,24 @@ def test_main_no_spec(capsys: pytest.CaptureFixture[Any]) -> None:
 
 
 @pytest.mark.parametrize(
-    ["verbose_cfg", "debug_cfg", "result"],
+    ["verbose_cfg", "debug_cfg", "expected_log_levels"],
     [
-        (False, False, ["warn"]),
-        (True, False, ["info", "warn"]),
-        (False, True, ["debug", "info", "warn"]),
-        (True, True, ["debug", "info", "warn"]),
+        (False, False, {logging.WARNING}),
+        (True, False, {logging.INFO, logging.WARNING}),
+        (False, True, {logging.DEBUG, logging.INFO, logging.WARNING}),
+        (True, True, {logging.DEBUG, logging.INFO, logging.WARNING}),
     ],
 )
 def test_logging_config(
-    monkeypatch: MonkeyPatch,
     caplog: pytest.LogCaptureFixture,
     verbose_cfg: bool,
     debug_cfg: bool,
-    result: List[str],
+    expected_log_levels: Set[int],
     tmp_path: Path,
 ) -> None:
     source_dir = tmp_path / "source"
     source_dir.mkdir()
 
-    def fake_find_missing_reqs(
-        requirements_filename: str,  # pylint: disable=unused-argument
-        paths: Iterable[str],  # pylint: disable=unused-argument
-        ignore_files_function: Callable[  # pylint: disable=unused-argument
-            [str], bool
-        ],
-        ignore_modules_function: Callable[  # pylint: disable=unused-argument
-            [str], bool
-        ],
-    ) -> List[Tuple[str, List[common.FoundModule]]]:
-        return []
-
-    monkeypatch.setattr(
-        find_missing_reqs,
-        "find_missing_reqs",
-        fake_find_missing_reqs,
-    )
     arguments = [str(source_dir)]
     if verbose_cfg:
         arguments.append("--verbose")
@@ -166,12 +147,8 @@ def fake_find_missing_reqs(
     ]:
         find_missing_reqs.log.log(*event)
 
-    messages = [r.message for r in caplog.records]
-    # first message is always the usage message
-    if verbose_cfg or debug_cfg:
-        assert messages[1:] == result
-    else:
-        assert messages == result
+    log_levels = {r.levelno for r in caplog.records}
+    assert log_levels == expected_log_levels
 
 
 def test_main_version(