fix: resolve MockerFixture attribute from pytest_mock directly

Issue: https://progress.opensuse.org/issues/198026

Author: d3flex

tests/test_openqa_bats_review.py

@@ -8,12 +8,15 @@
 import importlib.util
 import pathlib
 import sys
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from unittest.mock import Mock
 
 import pytest
 from requests.exceptions import RequestException
 
+if TYPE_CHECKING:
+    from pytest_mock import MockerFixture
+
 # Load the script as module "bats_review" (the file is named `openqa-bats-review`)
 rootpath = pathlib.Path(__file__).parent.parent.resolve()
 loader = importlib.machinery.SourceFileLoader("bats_review", f"{rootpath}/openqa-bats-review")
@@ -29,7 +32,7 @@
 #
 
 
-def test_get_file_success(mocker: pytest.MockerFixture) -> None:
+def test_get_file_success(mocker: MockerFixture) -> None:
     mock_session = mocker.patch("bats_review.session")
     resp = Mock()
     resp.text = "hello"
@@ -46,7 +49,7 @@ def test_get_file_success(mocker: pytest.MockerFixture) -> None:
     resp.raise_for_status.assert_called_once()
 
 
-def test_get_file_request_exception(mocker: pytest.MockerFixture) -> None:
+def test_get_file_request_exception(mocker: MockerFixture) -> None:
     mock_session = mocker.patch("bats_review.session")
     mock_log = mocker.patch("bats_review.log")
     mock_session.get.side_effect = RequestException("network")
@@ -56,7 +59,7 @@ def test_get_file_request_exception(mocker: pytest.MockerFixture) -> None:
     mock_log.exception.assert_called_once()
 
 
-def test_get_job_success(mocker: pytest.MockerFixture) -> None:
+def test_get_job_success(mocker: MockerFixture) -> None:
     with contextlib.suppress(Exception):
         bats_review.get_job.cache_clear()
     mock_session = mocker.patch("bats_review.session")
@@ -74,7 +77,7 @@ def test_get_job_success(mocker: pytest.MockerFixture) -> None:
     )
 
 
-def test_get_job_request_exception(mocker: pytest.MockerFixture) -> None:
+def test_get_job_request_exception(mocker: MockerFixture) -> None:
     with contextlib.suppress(Exception):
         bats_review.get_job.cache_clear()
     mock_session = mocker.patch("bats_review.session")
@@ -86,7 +89,7 @@ def test_get_job_request_exception(mocker: pytest.MockerFixture) -> None:
     mock_log.exception.assert_called_once()
 
 
-def test_grep_failures_success(mocker: pytest.MockerFixture) -> None:
+def test_grep_failures_success(mocker: MockerFixture) -> None:
     mock_get_file = mocker.patch("bats_review.get_file")
     # one passing, one failing testcase (with classname)
     mock_get_file.return_value = """
@@ -101,7 +104,7 @@ def test_grep_failures_success(mocker: pytest.MockerFixture) -> None:
     assert result == {"suite1:failing_test"}
 
 
-def test_grep_failures_malformed(mocker: pytest.MockerFixture) -> None:
+def test_grep_failures_malformed(mocker: MockerFixture) -> None:
     mock_get_file = mocker.patch("bats_review.get_file")
     mock_log = mocker.patch("bats_review.log")
     mock_get_file.return_value = "<this is not xml"
@@ -112,15 +115,15 @@ def test_grep_failures_malformed(mocker: pytest.MockerFixture) -> None:
     mock_log.exception.assert_called_once()
 
 
-def test_process_logs_single_file(mocker: pytest.MockerFixture) -> None:
+def test_process_logs_single_file(mocker: MockerFixture) -> None:
     mock_grep = mocker.patch("bats_review.grep_failures")
     mock_grep.return_value = {"a", "b"}
     res = bats_review.process_logs(["http://example.com/a.xml"])
     assert res == {"a", "b"}
     mock_grep.assert_called_once_with("http://example.com/a.xml")
 
 
-def test_process_logs_multiple_files(mocker: pytest.MockerFixture) -> None:
+def test_process_logs_multiple_files(mocker: MockerFixture) -> None:
     mock_executor_class = mocker.patch("bats_review.ThreadPoolExecutor")
     # build fake executor that returns map -> iterator of sets
     fake_executor = Mock()
@@ -134,7 +137,7 @@ def test_process_logs_multiple_files(mocker: pytest.MockerFixture) -> None:
     fake_executor.map.assert_called_once()
 
 
-def test_resolve_clone_chain_single(mocker: pytest.MockerFixture) -> None:
+def test_resolve_clone_chain_single(mocker: MockerFixture) -> None:
     with contextlib.suppress(Exception):
         bats_review.get_job.cache_clear()
     mock_get_job = mocker.patch("bats_review.get_job")
@@ -144,7 +147,7 @@ def test_resolve_clone_chain_single(mocker: pytest.MockerFixture) -> None:
     mock_get_job.assert_called_once_with("http://openqa/api/v1/jobs/123/details")
 
 
-def test_resolve_clone_chain_multiple(mocker: pytest.MockerFixture) -> None:
+def test_resolve_clone_chain_multiple(mocker: MockerFixture) -> None:
     with contextlib.suppress(Exception):
         bats_review.get_job.cache_clear()
     mock_get_job = mocker.patch("bats_review.get_job")
@@ -167,7 +170,7 @@ def side(url: str) -> dict[str, Any] | None:
 # main
 
 
-def test_main_no_clones(mocker: pytest.MockerFixture) -> None:
+def test_main_no_clones(mocker: MockerFixture) -> None:
     with contextlib.suppress(Exception):
         bats_review.get_job.cache_clear()
     mock_resolve = mocker.patch("bats_review.resolve_clone_chain")
@@ -179,7 +182,7 @@ def test_main_no_clones(mocker: pytest.MockerFixture) -> None:
     mock_log.info.assert_called_with("No clones. Exiting")
 
 
-def test_main_no_common_failures(mocker: pytest.MockerFixture) -> None:
+def test_main_no_common_failures(mocker: MockerFixture) -> None:
     """Two jobs in chain; each produces different failures -> no common failures.
 
     main should log Tagging as PASSED.
@@ -208,7 +211,7 @@ def job_resp(url: str) -> dict[str, Any]:
     mock_log.info.assert_called_with("No common failures across clone chain. Tagging as PASSED.")
 
 
-def test_main_insufficient_logs(mocker: pytest.MockerFixture) -> None:
+def test_main_insufficient_logs(mocker: MockerFixture) -> None:
     """If jobs do not have the expected number of logs (e.g. podman expects 4 but provides 2).
 
     main should log the 'only X logs' messages for each job and eventually exit(0).
@@ -235,13 +238,13 @@ def job_resp(url: str) -> dict[str, Any]:
     mock_log.info.assert_any_call("No logs found in chain. Exiting")
 
 
-def test_parse_args_success(mocker: pytest.MockerFixture) -> None:
+def test_parse_args_success(mocker: MockerFixture) -> None:
     mocker.patch("sys.argv", ["script.py", "http://example.com/tests/123"])
     args = bats_review.parse_args()
     assert args.url == "http://example.com/tests/123"
 
 
-def test_parse_args_missing_url(mocker: pytest.MockerFixture) -> None:
+def test_parse_args_missing_url(mocker: MockerFixture) -> None:
     mocker.patch("sys.argv", ["script.py"])
     with pytest.raises(SystemExit):
         bats_review.parse_args()
@@ -250,7 +253,7 @@ def test_parse_args_missing_url(mocker: pytest.MockerFixture) -> None:
 # Integration test
 
 
-def test_full_workflow_no_common_failures(mocker: pytest.MockerFixture) -> None:
+def test_full_workflow_no_common_failures(mocker: MockerFixture) -> None:
     """Patch session.get to simulate two jobs each with a different failing testcase.
 
     Asserts that the script decides to tag as PASSED (dry_run) when there are no common failures.

tests/test_openqa_llm_investigate.py

@@ -8,12 +8,15 @@
 import logging
 import pathlib
 import sys
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from unittest.mock import MagicMock, Mock
 
 import httpx
 import pytest
 
+if TYPE_CHECKING:
+    from pytest_mock import MockerFixture
+
 # Load the script as module "llm_investigate" (the file is named `openqa-llm-investigate`)
 rootpath = pathlib.Path(__file__).parent.parent.resolve()
 loader = importlib.machinery.SourceFileLoader("llm_investigate", f"{rootpath}/openqa-llm-investigate")
@@ -72,7 +75,7 @@ def test_fetch_text_failure() -> None:
     assert not res
 
 
-def test_post_comment(mocker: pytest.MockerFixture) -> None:
+def test_post_comment(mocker: MockerFixture) -> None:
     mock_run = mocker.patch("llm_investigate.subprocess.run")
     llm_investigate.post_comment("http://base", "123", "test comment")
     mock_run.assert_called_once()
@@ -82,7 +85,7 @@ def test_post_comment(mocker: pytest.MockerFixture) -> None:
     assert "text=test comment" in args
 
 
-def setup_mock_client(mocker: pytest.MockerFixture, overrides: dict[str, Any] | None = None) -> MagicMock:
+def setup_mock_client(mocker: MockerFixture, overrides: dict[str, Any] | None = None) -> MagicMock:
     mock_client_class = mocker.patch("llm_investigate.httpx.Client")
     mock_client = MagicMock()
     mock_client_class.return_value.__enter__.return_value = mock_client
@@ -143,7 +146,7 @@ def mock_post_call(url: str, json: dict[str, Any] | None = None, *args: Any, **k
     return mock_client
 
 
-def test_investigate_cmd(mocker: pytest.MockerFixture) -> None:
+def test_investigate_cmd(mocker: MockerFixture) -> None:
     mock_post = mocker.patch("llm_investigate.post_comment")
     mock_print = mocker.patch("builtins.print")
     setup_mock_client(mocker)
@@ -153,7 +156,7 @@ def test_investigate_cmd(mocker: pytest.MockerFixture) -> None:
     assert "BISECT: YES" in mock_post.call_args[0][2]
 
 
-def test_investigate_cmd_passed_job(mocker: pytest.MockerFixture) -> None:
+def test_investigate_cmd_passed_job(mocker: MockerFixture) -> None:
     mock_print = mocker.patch("builtins.print")
     setup_mock_client(mocker, overrides={"api/v1/jobs": {"job": {"id": 123, "result": "passed"}}})
 
@@ -164,7 +167,7 @@ def test_investigate_cmd_passed_job(mocker: pytest.MockerFixture) -> None:
     mock_print.assert_not_called()
 
 
-def test_investigate_cmd_softfailed_job(mocker: pytest.MockerFixture) -> None:
+def test_investigate_cmd_softfailed_job(mocker: MockerFixture) -> None:
     mock_print = mocker.patch("builtins.print")
     setup_mock_client(mocker, overrides={"api/v1/jobs": {"job": {"id": 123, "result": "softfailed"}}})
 
@@ -175,7 +178,7 @@ def test_investigate_cmd_softfailed_job(mocker: pytest.MockerFixture) -> None:
     mock_print.assert_not_called()
 
 
-def test_investigate_cmd_already_commented(mocker: pytest.MockerFixture) -> None:
+def test_investigate_cmd_already_commented(mocker: MockerFixture) -> None:
     mock_log = mocker.patch("llm_investigate.log")
     setup_mock_client(mocker, overrides={"comments": [{"text": "**LLM Investigation summary:** already done"}]})
 
@@ -187,7 +190,7 @@ def test_investigate_cmd_already_commented(mocker: pytest.MockerFixture) -> None
     assert "already has an LLM investigation summary" in mock_log.info.call_args[0][0]
 
 
-def test_investigate_cmd_already_commented_with_force(mocker: pytest.MockerFixture) -> None:
+def test_investigate_cmd_already_commented_with_force(mocker: MockerFixture) -> None:
     mock_post = mocker.patch("llm_investigate.post_comment")
     mock_print = mocker.patch("builtins.print")
     setup_mock_client(mocker, overrides={"comments": [{"text": "**LLM Investigation summary:** already done"}]})
@@ -199,7 +202,7 @@ def test_investigate_cmd_already_commented_with_force(mocker: pytest.MockerFixtu
     assert "BISECT: YES" in mock_post.call_args[0][2]
 
 
-def test_investigate_cmd_dry_run(mocker: pytest.MockerFixture) -> None:
+def test_investigate_cmd_dry_run(mocker: MockerFixture) -> None:
     mock_post = mocker.patch("llm_investigate.post_comment")
     mock_print = mocker.patch("builtins.print")
     client = setup_mock_client(mocker)
@@ -214,7 +217,7 @@ def test_investigate_cmd_dry_run(mocker: pytest.MockerFixture) -> None:
     mock_print.assert_any_call("**LLM Investigation summary:**\n\nBISECT: NO. Already known.")
 
 
-def test_investigate_cmd_connection_error(mocker: pytest.MockerFixture) -> None:
+def test_investigate_cmd_connection_error(mocker: MockerFixture) -> None:
     mock_log = mocker.patch("llm_investigate.log")
     client = setup_mock_client(mocker)
     client.post.side_effect = httpx.ConnectError("Connection refused")
@@ -227,7 +230,7 @@ def test_investigate_cmd_connection_error(mocker: pytest.MockerFixture) -> None:
     assert "Could not connect to LLM server" in mock_log.error.call_args[0][0]
 
 
-def test_investigate_logging_levels(mocker: pytest.MockerFixture) -> None:
+def test_investigate_logging_levels(mocker: MockerFixture) -> None:
     mock_basic_config = mocker.patch("llm_investigate.logging.basicConfig")
     mocker.patch("llm_investigate.httpx.Client")
     mock_fetch = mocker.patch("llm_investigate.fetch_json")