fix quart

Author: Zylphrex

tests/integrations/quart/test_quart.py

@@ -1,8 +1,8 @@
 import json
 import threading
+from unittest import mock
 
 import pytest
-import pytest_asyncio
 
 import sentry_sdk
 from sentry_sdk import (
@@ -28,8 +28,7 @@
     auth_manager = AuthManager()
 
 
-@pytest_asyncio.fixture
-async def app():
+def quart_app_factory():
     app = Quart(__name__)
     app.debug = False
     app.config["TESTING"] = False
@@ -73,8 +72,9 @@ def integration_enabled_params(request):
 
 
 @pytest.mark.asyncio
-async def test_has_context(sentry_init, app, capture_events):
+async def test_has_context(sentry_init, capture_events):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
     events = capture_events()
 
     client = app.test_client()
@@ -99,7 +99,6 @@ async def test_has_context(sentry_init, app, capture_events):
 )
 async def test_transaction_style(
     sentry_init,
-    app,
     capture_events,
     url,
     transaction_style,
@@ -111,6 +110,7 @@ async def test_transaction_style(
             quart_sentry.QuartIntegration(transaction_style=transaction_style)
         ]
     )
+    app = quart_app_factory()
     events = capture_events()
 
     client = app.test_client()
@@ -126,10 +126,10 @@ async def test_errors(
     sentry_init,
     capture_exceptions,
     capture_events,
-    app,
     integration_enabled_params,
 ):
     sentry_init(**integration_enabled_params)
+    app = quart_app_factory()
 
     @app.route("/")
     async def index():
@@ -153,9 +153,10 @@ async def index():
 
 @pytest.mark.asyncio
 async def test_quart_auth_not_installed(
-    sentry_init, app, capture_events, monkeypatch, integration_enabled_params
+    sentry_init, capture_events, monkeypatch, integration_enabled_params
 ):
     sentry_init(**integration_enabled_params)
+    app = quart_app_factory()
 
     monkeypatch.setattr(quart_sentry, "quart_auth", None)
 
@@ -170,9 +171,10 @@ async def test_quart_auth_not_installed(
 
 @pytest.mark.asyncio
 async def test_quart_auth_not_configured(
-    sentry_init, app, capture_events, monkeypatch, integration_enabled_params
+    sentry_init, capture_events, monkeypatch, integration_enabled_params
 ):
     sentry_init(**integration_enabled_params)
+    app = quart_app_factory()
 
     assert quart_sentry.quart_auth
 
@@ -186,9 +188,10 @@ async def test_quart_auth_not_configured(
 
 @pytest.mark.asyncio
 async def test_quart_auth_partially_configured(
-    sentry_init, app, capture_events, monkeypatch, integration_enabled_params
+    sentry_init, capture_events, monkeypatch, integration_enabled_params
 ):
     sentry_init(**integration_enabled_params)
+    app = quart_app_factory()
 
     events = capture_events()
 
@@ -205,13 +208,13 @@ async def test_quart_auth_partially_configured(
 async def test_quart_auth_configured(
     send_default_pii,
     sentry_init,
-    app,
     user_id,
     capture_events,
     monkeypatch,
     integration_enabled_params,
 ):
     sentry_init(send_default_pii=send_default_pii, **integration_enabled_params)
+    app = quart_app_factory()
 
     @app.route("/login")
     async def login():
@@ -242,10 +245,9 @@ async def login():
         [quart_sentry.QuartIntegration(), LoggingIntegration(event_level="ERROR")],
     ],
 )
-async def test_errors_not_reported_twice(
-    sentry_init, integrations, capture_events, app
-):
+async def test_errors_not_reported_twice(sentry_init, integrations, capture_events):
     sentry_init(integrations=integrations)
+    app = quart_app_factory()
 
     @app.route("/")
     async def index():
@@ -265,14 +267,15 @@ async def index():
 
 
 @pytest.mark.asyncio
-async def test_logging(sentry_init, capture_events, app):
+async def test_logging(sentry_init, capture_events):
     # ensure that Quart's logger magic doesn't break ours
     sentry_init(
         integrations=[
             quart_sentry.QuartIntegration(),
             LoggingIntegration(event_level="ERROR"),
         ]
     )
+    app = quart_app_factory()
 
     @app.route("/")
     async def index():
@@ -289,13 +292,17 @@ async def index():
 
 
 @pytest.mark.asyncio
-async def test_no_errors_without_request(app, sentry_init):
+async def test_no_errors_without_request(sentry_init):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
+
     async with app.app_context():
         capture_exception(ValueError())
 
 
-def test_cli_commands_raise(app):
+def test_cli_commands_raise():
+    app = quart_app_factory()
+
     if not hasattr(app, "cli"):
         pytest.skip("Too old quart version")
 
@@ -312,8 +319,9 @@ def foo():
 
 
 @pytest.mark.asyncio
-async def test_500(sentry_init, app):
+async def test_500(sentry_init):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
 
     @app.route("/")
     async def index():
@@ -330,8 +338,9 @@ async def error_handler(err):
 
 
 @pytest.mark.asyncio
-async def test_error_in_errorhandler(sentry_init, capture_events, app):
+async def test_error_in_errorhandler(sentry_init, capture_events):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
 
     @app.route("/")
     async def index():
@@ -358,8 +367,9 @@ async def error_handler(err):
 
 
 @pytest.mark.asyncio
-async def test_bad_request_not_captured(sentry_init, capture_events, app):
+async def test_bad_request_not_captured(sentry_init, capture_events):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
     events = capture_events()
 
     @app.route("/")
@@ -374,8 +384,9 @@ async def index():
 
 
 @pytest.mark.asyncio
-async def test_does_not_leak_scope(sentry_init, capture_events, app):
+async def test_does_not_leak_scope(sentry_init, capture_events):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
     events = capture_events()
 
     sentry_sdk.get_isolation_scope().set_tag("request_data", False)
@@ -402,8 +413,9 @@ async def generate():
 
 
 @pytest.mark.asyncio
-async def test_scoped_test_client(sentry_init, app):
+async def test_scoped_test_client(sentry_init):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
 
     @app.route("/")
     async def index():
@@ -417,12 +429,13 @@ async def index():
 @pytest.mark.asyncio
 @pytest.mark.parametrize("exc_cls", [ZeroDivisionError, Exception])
 async def test_errorhandler_for_exception_swallows_exception(
-    sentry_init, app, capture_events, exc_cls
+    sentry_init, capture_events, exc_cls
 ):
     # In contrast to error handlers for a status code, error
     # handlers for exceptions can swallow the exception (this is
     # just how the Quart signal works)
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
     events = capture_events()
 
     @app.route("/")
@@ -441,8 +454,9 @@ async def zerodivision(e):
 
 
 @pytest.mark.asyncio
-async def test_tracing_success(sentry_init, capture_events, app):
+async def test_tracing_success(sentry_init, capture_events):
     sentry_init(traces_sample_rate=1.0, integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
 
     @app.before_request
     async def _():
@@ -474,8 +488,9 @@ async def hi_tx():
 
 
 @pytest.mark.asyncio
-async def test_tracing_error(sentry_init, capture_events, app):
+async def test_tracing_error(sentry_init, capture_events):
     sentry_init(traces_sample_rate=1.0, integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
 
     events = capture_events()
 
@@ -498,8 +513,9 @@ async def error():
 
 
 @pytest.mark.asyncio
-async def test_class_based_views(sentry_init, app, capture_events):
+async def test_class_based_views(sentry_init, capture_events):
     sentry_init(integrations=[quart_sentry.QuartIntegration()])
+    app = quart_app_factory()
     events = capture_events()
 
     @app.route("/")
@@ -523,12 +539,14 @@ async def dispatch_request(self):
 
 
 @pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
+@mock.patch("sentry_sdk.profiler.transaction_profiler.PROFILE_MINIMUM_SAMPLES", 0)
 @pytest.mark.asyncio
-async def test_active_thread_id(sentry_init, capture_envelopes, endpoint, app):
+async def test_active_thread_id(sentry_init, capture_envelopes, endpoint):
     sentry_init(
         traces_sample_rate=1.0,
         profiles_sample_rate=1.0,
     )
+    app = quart_app_factory()
 
     envelopes = capture_envelopes()
 
@@ -559,12 +577,12 @@ async def test_active_thread_id(sentry_init, capture_envelopes, endpoint, app):
 
 
 @pytest.mark.asyncio
-async def test_span_origin(sentry_init, capture_events, app):
+async def test_span_origin(sentry_init, capture_events):
     sentry_init(
         integrations=[quart_sentry.QuartIntegration()],
         traces_sample_rate=1.0,
     )
-
+    app = quart_app_factory()
     events = capture_events()
 
     client = app.test_client()