chore: s/MockFixture/MockerFixture/g (#29160)

tests/integration_tests/access_tests.py

@@ -22,7 +22,7 @@
 
 import pytest
 from flask.ctx import AppContext
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 from sqlalchemy import inspect  # noqa: F401
 
 from tests.integration_tests.fixtures.birth_names_dashboard import (
@@ -90,7 +90,7 @@
 )
 def test_get_user_id(
     app_context: AppContext,
-    mocker: MockFixture,
+    mocker: MockerFixture,
     username: Optional[str],
     user_id: Optional[int],
 ) -> None:
@@ -109,7 +109,7 @@ def test_get_user_id(
 )
 def test_get_username(
     app_context: AppContext,
-    mocker: MockFixture,
+    mocker: MockerFixture,
     username: Optional[str],
 ) -> None:
     mock_g = mocker.patch("superset.utils.core.g", spec={})
@@ -121,7 +121,7 @@ def test_get_username(
 @pytest.mark.parametrize("force", [False, True])
 def test_override_user(
     app_context: AppContext,
-    mocker: MockFixture,
+    mocker: MockerFixture,
     username: str,
     force: bool,
 ) -> None:

tests/integration_tests/reports/alert_tests.py

@@ -21,7 +21,7 @@
 import pandas as pd
 import pytest
 from flask.ctx import AppContext
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 
 from superset.commands.report.exceptions import AlertQueryError
 from superset.reports.models import ReportCreationMethod, ReportScheduleType
@@ -61,7 +61,7 @@ def test_execute_query_as_report_executor(
     creator_name: Optional[str],
     config: list[ExecutorType],
     expected_result: Union[tuple[ExecutorType, str], Exception],
-    mocker: MockFixture,
+    mocker: MockerFixture,
     app_context: AppContext,
     get_user,
 ) -> None:
@@ -99,7 +99,7 @@ def test_execute_query_as_report_executor(
 
 
 def test_execute_query_succeeded_no_retry(
-    mocker: MockFixture, app_context: None
+    mocker: MockerFixture, app_context: None
 ) -> None:
     from superset.commands.report.alert import AlertCommand
 
@@ -116,7 +116,7 @@ def test_execute_query_succeeded_no_retry(
 
 
 def test_execute_query_succeeded_with_retries(
-    mocker: MockFixture, app_context: None
+    mocker: MockerFixture, app_context: None
 ) -> None:
     from superset.commands.report.alert import AlertCommand, AlertQueryError
 
@@ -147,7 +147,9 @@ def _mocked_execute_query() -> pd.DataFrame:
     assert execute_query_mock.call_count == expected_max_retries
 
 
-def test_execute_query_failed_no_retry(mocker: MockFixture, app_context: None) -> None:
+def test_execute_query_failed_no_retry(
+    mocker: MockerFixture, app_context: None
+) -> None:
     from superset.commands.report.alert import AlertCommand, AlertQueryTimeout
 
     execute_query_mock = mocker.patch(
@@ -168,7 +170,7 @@ def _mocked_execute_query() -> None:
 
 
 def test_execute_query_failed_max_retries(
-    mocker: MockFixture, app_context: None
+    mocker: MockerFixture, app_context: None
 ) -> None:
     from superset.commands.report.alert import AlertCommand, AlertQueryError
 

tests/integration_tests/sqla_models_tests.py

@@ -25,7 +25,7 @@
 import numpy as np
 import pandas as pd
 from flask.ctx import AppContext
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 from sqlalchemy.sql import text
 from sqlalchemy.sql.elements import TextClause
 
@@ -856,7 +856,7 @@ def test_none_operand_in_filter(login_as_admin, physical_dataset):
     ],
 )
 def test__normalize_prequery_result_type(
-    mocker: MockFixture,
+    mocker: MockerFixture,
     row: pd.Series,
     dimension: str,
     result: Any,

tests/integration_tests/test_jinja_context.py

@@ -19,7 +19,7 @@
 
 import pytest
 from flask.ctx import AppContext
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 
 import superset.utils.database
 from superset.exceptions import SupersetTemplateException
@@ -109,7 +109,7 @@ def test_template_kwarg_nested_module(app_context: AppContext) -> None:
         tp.process_template(template, foo={"bar": datetime})
 
 
-def test_template_hive(app_context: AppContext, mocker: MockFixture) -> None:
+def test_template_hive(app_context: AppContext, mocker: MockerFixture) -> None:
     lp_mock = mocker.patch(
         "superset.jinja_context.HiveTemplateProcessor.latest_partition"
     )
@@ -121,7 +121,7 @@ def test_template_hive(app_context: AppContext, mocker: MockFixture) -> None:
     assert tp.process_template(template) == "the_latest"
 
 
-def test_template_spark(app_context: AppContext, mocker: MockFixture) -> None:
+def test_template_spark(app_context: AppContext, mocker: MockerFixture) -> None:
     lp_mock = mocker.patch(
         "superset.jinja_context.SparkTemplateProcessor.latest_partition"
     )
@@ -138,7 +138,7 @@ def test_template_spark(app_context: AppContext, mocker: MockFixture) -> None:
     assert tp.process_template(template) == "the_latest"
 
 
-def test_template_trino(app_context: AppContext, mocker: MockFixture) -> None:
+def test_template_trino(app_context: AppContext, mocker: MockerFixture) -> None:
     lp_mock = mocker.patch(
         "superset.jinja_context.TrinoTemplateProcessor.latest_partition"
     )
@@ -155,7 +155,9 @@ def test_template_trino(app_context: AppContext, mocker: MockFixture) -> None:
     assert tp.process_template(template) == "the_latest"
 
 
-def test_template_context_addons(app_context: AppContext, mocker: MockFixture) -> None:
+def test_template_context_addons(
+    app_context: AppContext, mocker: MockerFixture
+) -> None:
     addons_mock = mocker.patch("superset.jinja_context.context_addons")
     addons_mock.return_value = {"datetime": datetime}
     maindb = superset.utils.database.get_example_database()
@@ -164,7 +166,9 @@ def test_template_context_addons(app_context: AppContext, mocker: MockFixture) -
     assert tp.process_template(template) == "SELECT '2017-01-01T00:00:00'"
 
 
-def test_custom_process_template(app_context: AppContext, mocker: MockFixture) -> None:
+def test_custom_process_template(
+    app_context: AppContext, mocker: MockerFixture
+) -> None:
     """Test macro defined in custom template processor works."""
 
     mock_dt = mocker.patch(

tests/unit_tests/charts/commands/importers/v1/import_test.py

@@ -21,7 +21,7 @@
 
 import pytest
 from flask_appbuilder.security.sqla.models import Role, User
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 from sqlalchemy.orm.session import Session
 
 from superset import security_manager
@@ -71,7 +71,7 @@ def session_with_schema(session: Session) -> Generator[Session, None, None]:
     yield session
 
 
-def test_import_chart(mocker: MockFixture, session_with_schema: Session) -> None:
+def test_import_chart(mocker: MockerFixture, session_with_schema: Session) -> None:
     """
     Test importing a chart.
     """
@@ -93,7 +93,7 @@ def test_import_chart(mocker: MockFixture, session_with_schema: Session) -> None
 
 
 def test_import_chart_managed_externally(
-    mocker: MockFixture, session_with_schema: Session
+    mocker: MockerFixture, session_with_schema: Session
 ) -> None:
     """
     Test importing a chart that is managed externally.
@@ -115,7 +115,7 @@ def test_import_chart_managed_externally(
 
 
 def test_import_chart_without_permission(
-    mocker: MockFixture,
+    mocker: MockerFixture,
     session_with_schema: Session,
 ) -> None:
     """
@@ -156,7 +156,7 @@ def test_filter_chart_annotations(session: Session) -> None:
 
 
 def test_import_existing_chart_without_permission(
-    mocker: MockFixture,
+    mocker: MockerFixture,
     session_with_data: Session,
 ) -> None:
     """
@@ -185,7 +185,7 @@ def test_import_existing_chart_without_permission(
 
 
 def test_import_existing_chart_with_permission(
-    mocker: MockFixture,
+    mocker: MockerFixture,
     session_with_data: Session,
 ) -> None:
     """

tests/unit_tests/commands/dataset/test_update.py

@@ -17,7 +17,7 @@
 from unittest.mock import MagicMock
 
 import pytest
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 
 from superset import db
 from superset.commands.dataset.exceptions import DatasetInvalidError
@@ -27,7 +27,7 @@
 
 
 @pytest.mark.usefixture("session")
-def test_update_uniqueness_error(mocker: MockFixture) -> None:
+def test_update_uniqueness_error(mocker: MockerFixture) -> None:
     SqlaTable.metadata.create_all(db.session.get_bind())
     database = Database(database_name="my_db", sqlalchemy_uri="sqlite://")
     bar = SqlaTable(table_name="bar", schema="foo", database=database)

tests/unit_tests/commands/export_test.py

@@ -17,10 +17,10 @@
 # pylint: disable=invalid-name, unused-argument, import-outside-toplevel
 
 from freezegun import freeze_time
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 
 
-def test_export_assets_command(mocker: MockFixture) -> None:
+def test_export_assets_command(mocker: MockerFixture) -> None:
     """
     Test that all assets are exported correctly.
     """

tests/unit_tests/commands/importers/v1/assets_test.py

@@ -17,7 +17,7 @@
 
 import copy
 
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 from sqlalchemy.orm.session import Session
 from sqlalchemy.sql import select
 
@@ -31,7 +31,7 @@
 )
 
 
-def test_import_new_assets(mocker: MockFixture, session: Session) -> None:
+def test_import_new_assets(mocker: MockerFixture, session: Session) -> None:
     """
     Test that all new assets are imported correctly.
     """
@@ -63,7 +63,7 @@ def test_import_new_assets(mocker: MockFixture, session: Session) -> None:
     assert len(dashboard_ids) == expected_number_of_dashboards
 
 
-def test_import_adds_dashboard_charts(mocker: MockFixture, session: Session) -> None:
+def test_import_adds_dashboard_charts(mocker: MockerFixture, session: Session) -> None:
     """
     Test that existing dashboards are updated with new charts.
     """
@@ -102,7 +102,9 @@ def test_import_adds_dashboard_charts(mocker: MockFixture, session: Session) ->
     assert len(dashboard_ids) == expected_number_of_dashboards
 
 
-def test_import_removes_dashboard_charts(mocker: MockFixture, session: Session) -> None:
+def test_import_removes_dashboard_charts(
+    mocker: MockerFixture, session: Session
+) -> None:
     """
     Test that existing dashboards are updated without old charts.
     """

tests/unit_tests/conftest.py

@@ -25,7 +25,7 @@
 
 import pytest
 from _pytest.fixtures import SubRequest
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.session import Session
@@ -39,7 +39,7 @@
 
 
 @pytest.fixture
-def get_session(mocker: MockFixture) -> Callable[[], Session]:
+def get_session(mocker: MockerFixture) -> Callable[[], Session]:
     """
     Create an in-memory SQLite db.session.to test models.
     """
@@ -141,7 +141,7 @@ def app_context(app: SupersetApp) -> Iterator[None]:
 
 
 @pytest.fixture
-def full_api_access(mocker: MockFixture) -> Iterator[None]:
+def full_api_access(mocker: MockerFixture) -> Iterator[None]:
     """
     Allow full access to the API.
 

tests/unit_tests/dao/queries_test.py

@@ -18,7 +18,7 @@
 from typing import Any
 
 import pytest
-from pytest_mock import MockFixture
+from pytest_mock import MockerFixture
 from sqlalchemy.orm.session import Session
 
 from superset.exceptions import QueryNotFoundException, SupersetCancelQueryException
@@ -116,7 +116,7 @@ def test_query_dao_get_queries_changed_after(session: Session) -> None:
 
 
 def test_query_dao_stop_query_not_found(
-    mocker: MockFixture, app: Any, session: Session
+    mocker: MockerFixture, app: Any, session: Session
 ) -> None:
     from superset import db
     from superset.common.db_query_status import QueryStatus
@@ -159,7 +159,7 @@ def test_query_dao_stop_query_not_found(
 
 
 def test_query_dao_stop_query_not_running(
-    mocker: MockFixture, app: Any, session: Session
+    mocker: MockerFixture, app: Any, session: Session
 ) -> None:
     from superset import db
     from superset.common.db_query_status import QueryStatus
@@ -198,7 +198,7 @@ def test_query_dao_stop_query_not_running(
 
 
 def test_query_dao_stop_query_failed(
-    mocker: MockFixture, app: Any, session: Session
+    mocker: MockerFixture, app: Any, session: Session
 ) -> None:
     from superset import db
     from superset.common.db_query_status import QueryStatus
@@ -240,7 +240,9 @@ def test_query_dao_stop_query_failed(
     assert query.status == QueryStatus.RUNNING
 
 
-def test_query_dao_stop_query(mocker: MockFixture, app: Any, session: Session) -> None:
+def test_query_dao_stop_query(
+    mocker: MockerFixture, app: Any, session: Session
+) -> None:
     from superset import db
     from superset.common.db_query_status import QueryStatus
     from superset.models.core import Database