conftests (#98106)

`mypy` no errors

Author: thetruecpaul

tests/conftest.py

@@ -51,20 +51,20 @@ def _open_files() -> frozenset[str]:
 
 
 @pytest.fixture(autouse=True)
-def unclosed_files():
+def unclosed_files() -> Generator[None]:
     fds = _open_files()
     yield
     assert _open_files() == fds
 
 
 @pytest.fixture(autouse=True)
-def unclosed_threads(request):
+def unclosed_threads(request: pytest.FixtureRequest) -> Generator[None]:
     # TODO(DI-1067): strict mode
     yield from thread_leaks.check_test(request, strict=False)
 
 
 @pytest.fixture(autouse=True)
-def validate_silo_mode():
+def validate_silo_mode() -> Generator[None]:
     # NOTE!  Hybrid cloud uses many mechanisms to simulate multiple different configurations of the application
     # during tests.  It depends upon `override_settings` using the correct contextmanager behaviors and correct
     # thread handling in acceptance tests.  If you hit one of these, it's possible either that cleanup logic has
@@ -83,23 +83,23 @@ def validate_silo_mode():
 
 
 @pytest.fixture(autouse=True)
-def setup_simulate_on_commit(request):
+def setup_simulate_on_commit(request: pytest.FixtureRequest) -> Generator[None]:
     from sentry.testutils.hybrid_cloud import simulate_on_commit
 
     with simulate_on_commit(request):
         yield
 
 
 @pytest.fixture(autouse=True)
-def setup_enforce_monotonic_transactions(request):
+def setup_enforce_monotonic_transactions(request: pytest.FixtureRequest) -> Generator[None]:
     from sentry.testutils.hybrid_cloud import enforce_no_cross_transaction_interactions
 
     with enforce_no_cross_transaction_interactions():
         yield
 
 
 @pytest.fixture(autouse=True)
-def audit_hybrid_cloud_writes_and_deletes(request):
+def audit_hybrid_cloud_writes_and_deletes(request: pytest.FixtureRequest) -> Generator[None]:
     """
     Ensure that write operations on hybrid cloud foreign keys are recorded
     alongside outboxes or use a context manager to indicate that the
@@ -137,13 +137,13 @@ def audit_hybrid_cloud_writes_and_deletes(request):
 
 
 @pytest.fixture(autouse=True)
-def clear_caches():
+def clear_caches() -> Generator[None]:
     yield
     cache.clear()
 
 
 @pytest.fixture(autouse=True)
-def check_leaked_responses_mocks():
+def check_leaked_responses_mocks() -> Generator[None]:
     yield
     leaked = responses.registered()
     if leaked:

tests/sentry/api/endpoints/conftest.py

@@ -1,32 +1,33 @@
 from uuid import uuid4
 
 import pytest
+from sentry_relay.auth import PublicKey, SecretKey
+
+from sentry.models.relay import Relay
 
 
 @pytest.fixture
-def key_pair():
+def key_pair() -> tuple[SecretKey, PublicKey]:
     from sentry_relay.auth import generate_key_pair
 
     return generate_key_pair()
 
 
 @pytest.fixture
-def public_key(key_pair):
+def public_key(key_pair: tuple[SecretKey, PublicKey]) -> PublicKey:
     return key_pair[1]
 
 
 @pytest.fixture
-def private_key(key_pair):
+def private_key(key_pair: tuple[SecretKey, PublicKey]) -> SecretKey:
     return key_pair[0]
 
 
 @pytest.fixture
-def relay_id():
+def relay_id() -> str:
     return str(uuid4())
 
 
 @pytest.fixture
-def relay(relay_id, public_key):
-    from sentry.models.relay import Relay
-
+def relay(relay_id: str | int, public_key: PublicKey) -> Relay:
     return Relay.objects.create(relay_id=relay_id, public_key=str(public_key), is_internal=True)

tests/sentry/feedback/__init__.py

@@ -6,7 +6,7 @@
 from openai.types.chat.chat_completion_message import ChatCompletionMessage
 
 
-def create_dummy_openai_response(*args, **kwargs) -> ChatCompletion:
+def create_dummy_openai_response(*args: object, **kwargs: Any) -> ChatCompletion:
     return ChatCompletion(
         id="test",
         choices=[

tests/sentry/feedback/usecases/conftest.py

@@ -1,18 +1,22 @@
+from collections.abc import Callable, Generator
+from typing import Any
 from unittest import mock
 
 import pytest
 
 
 @pytest.fixture
-def mock_produce_occurrence_to_kafka():
+def mock_produce_occurrence_to_kafka() -> Generator[mock.MagicMock]:
     with mock.patch(
         "sentry.feedback.usecases.ingest.create_feedback.produce_occurrence_to_kafka"
     ) as mck:
         yield mck
 
 
 @pytest.fixture(autouse=True)
-def llm_settings(set_sentry_option):
+def llm_settings(
+    set_sentry_option: Callable[[str, dict[str, dict[str, Any]]], Any],
+) -> Generator[None]:
     with (
         set_sentry_option(
             "llm.provider.options",

tests/sentry/tasks/conftest.py

@@ -1,14 +1,18 @@
 import contextlib
+from collections.abc import Callable, Generator
+from typing import Any
 from unittest import mock
 
 import pytest
 
 
 @pytest.fixture
-def register_plugin(request):
+def register_plugin(
+    request: pytest.FixtureRequest,
+) -> Generator[Callable[[dict[str, Any], type[Any]], None]]:
     from sentry.plugins.base import plugins
 
-    def inner(globals, cls):
+    def inner(globals: dict[str, Any], cls: type[Any]) -> None:
         ctx.enter_context(mock.patch.dict(globals, {cls.__name__: cls}))
         plugins.register(cls)
         request.addfinalizer(lambda: plugins.unregister(cls))

tests/sentry/utils/sdk_crashes/conftest.py

@@ -1,5 +1,10 @@
+from collections.abc import Callable, Collection
+from types import ModuleType
+
 import pytest
 
+from sentry.models.project import Project
+from sentry.services.eventstore.models import Event
 from sentry.utils.sdk_crashes.path_replacer import FixedPathReplacer
 from sentry.utils.sdk_crashes.sdk_crash_detection_config import (
     SDKCrashDetectionConfig,
@@ -9,8 +14,10 @@
 
 
 @pytest.fixture
-def store_event(default_project, factories):
-    def inner(data):
+def store_event(
+    default_project: Project, factories: ModuleType
+) -> Callable[[dict[str, Collection[str]]], Event]:
+    def inner(data: dict[str, Collection[str]]) -> Event:
         return factories.store_event(data=data, project_id=default_project.id)
 
     return inner