|
@@ -12,8 +12,8 @@ from typing import TypeVar
|
|
from unittest import mock
|
|
from unittest import mock
|
|
|
|
|
|
import pytest
|
|
import pytest
|
|
|
|
+import sentry_sdk
|
|
from django.conf import settings
|
|
from django.conf import settings
|
|
-from sentry_sdk import Hub
|
|
|
|
|
|
|
|
from sentry.runner.importer import install_plugin_apps
|
|
from sentry.runner.importer import install_plugin_apps
|
|
from sentry.silo.base import SiloMode
|
|
from sentry.silo.base import SiloMode
|
|
@@ -295,7 +295,7 @@ def pytest_configure(config: pytest.Config) -> None:
|
|
from sentry.runner.initializer import initialize_app
|
|
from sentry.runner.initializer import initialize_app
|
|
|
|
|
|
initialize_app({"settings": settings, "options": None})
|
|
initialize_app({"settings": settings, "options": None})
|
|
- Hub.main.bind_client(None)
|
|
|
|
|
|
+ sentry_sdk.Scope.get_global_scope().set_client(None)
|
|
register_extensions()
|
|
register_extensions()
|
|
|
|
|
|
from sentry.utils.redis import clusters
|
|
from sentry.utils.redis import clusters
|
|
@@ -371,7 +371,7 @@ def pytest_runtest_teardown(item: pytest.Item) -> None:
|
|
ProjectOption.objects.clear_local_cache()
|
|
ProjectOption.objects.clear_local_cache()
|
|
UserOption.objects.clear_local_cache()
|
|
UserOption.objects.clear_local_cache()
|
|
|
|
|
|
- Hub.main.bind_client(None)
|
|
|
|
|
|
+ sentry_sdk.Scope.get_global_scope().set_client(None)
|
|
|
|
|
|
|
|
|
|
def _shuffle(items: list[pytest.Item]) -> None:
|
|
def _shuffle(items: list[pytest.Item]) -> None:
|