fix: Deal with out-of-order scope teardown in Flask tests

untitaker · untitaker · commit 6bdbbe4aa614 · 2018-12-19T18:28:57.000+01:00
Fix getsentry#222
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
@@ -61,15 +61,17 @@ def _push_appctx(*args, **kwargs):
     if hub.get_integration(FlaskIntegration) is not None:
         # always want to push scope regardless of whether WSGI app might already
         # have (not the case for CLI for example)
-        hub.push_scope()
+        scope_manager = hub.push_scope()
+        scope_manager.__enter__()
+        _app_ctx_stack.top.sentry_sdk_scope_manager = scope_manager
         with hub.configure_scope() as scope:
             scope._name = "flask"
 
 
 def _pop_appctx(*args, **kwargs):
-    hub = Hub.current
-    if hub.get_integration(FlaskIntegration) is not None:
-        hub.pop_scope_unsafe()
+    scope_manager = getattr(_app_ctx_stack.top, "sentry_sdk_scope_manager", None)
+    if scope_manager is not None:
+        scope_manager.__exit__(None, None, None)
 
 
 def _request_started(sender, **kwargs):
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
@@ -495,3 +495,15 @@ def generate():
 
     with configure_scope() as scope:
         assert not scope._tags["request_data"]
+
+
+def test_scoped_test_client(sentry_init, app):
+    sentry_init(integrations=[flask_sentry.FlaskIntegration()])
+
+    @app.route("/")
+    def index():
+        return "ok"
+
+    with app.test_client() as client:
+        response = client.get("/")
+        assert response.status_code == 200
