revert litestar and starlite tests as behavior unchanged

Author: alexander-alderman-webb

tests/integrations/litestar/test_litestar.py

@@ -50,10 +50,6 @@ async def message_with_id() -> "dict[str, Any]":
         capture_message("hi")
         return {"status": "ok"}
 
-    @get("/nomessage")
-    async def nomessage() -> "dict[str, Any]":
-        return {"status": "ok"}
-
     logging_config = LoggingConfig()
 
     app = Litestar(
@@ -62,7 +58,6 @@ async def nomessage() -> "dict[str, Any]":
             custom_error,
             message,
             message_with_id,
-            nomessage,
             MyController,
         ],
         debug=debug,
@@ -826,48 +821,3 @@ async def error() -> None: ...
     event_exception = events[0]["exception"]["values"][0]
     assert event_exception["type"] == "RuntimeError"
     assert event_exception["value"] == "Too Hot"
-
-
-@pytest.mark.parametrize("span_streaming", [True, False])
-def test_request_url(sentry_init, capture_events, capture_items, span_streaming):
-    sentry_init(
-        traces_sample_rate=1.0,
-        integrations=[LitestarIntegration()],
-        send_default_pii=True,
-        _experiments={
-            "trace_lifecycle": "stream" if span_streaming else "static",
-        },
-    )
-
-    litestar_app = litestar_app_factory()
-    client = TestClient(
-        litestar_app, base_url="http://testserver.local", root_path="/root"
-    )
-
-    if span_streaming:
-        items = capture_items("span")
-
-        # https://github.com/litestar-org/litestar/commit/72dda171768bd470adc065c47c1ecf1d80b5e749
-        url = "/root/nomessage" if LITESTAR_VERSION >= (2, 5, 3) else "/nomessage"
-        client.get(url)
-
-        sentry_sdk.flush()
-        spans = [item.payload for item in items]
-
-        (server_span,) = (
-            span
-            for span in spans
-            if span["attributes"].get("sentry.op") == "http.server"
-        )
-        assert server_span["attributes"]["url.full"] == (
-            "http://testserver.local/root/nomessage"
-        )
-    else:
-        events = capture_events()
-
-        # https://github.com/litestar-org/litestar/commit/72dda171768bd470adc065c47c1ecf1d80b5e749
-        url = "/root/nomessage" if LITESTAR_VERSION >= (2, 5, 3) else "/nomessage"
-        client.get(url)
-
-        (event,) = events
-        assert event["request"]["url"] == "http://testserver.local/root/nomessage"

tests/integrations/starlite/test_starlite.py

@@ -41,10 +41,6 @@ async def message_with_id() -> "Dict[str, Any]":
         capture_message("hi")
         return {"status": "ok"}
 
-    @get("/nomessage")
-    async def nomessage() -> "Dict[str, Any]":
-        return {"status": "ok"}
-
     logging_config = LoggingConfig()
 
     app = Starlite(
@@ -53,7 +49,6 @@ async def nomessage() -> "Dict[str, Any]":
             custom_error,
             message,
             message_with_id,
-            nomessage,
             MyController,
         ],
         debug=debug,
@@ -579,44 +574,3 @@ async def __call__(self, scope, receive, send):
         }
     else:
         assert "user" not in event
-
-
-@pytest.mark.parametrize("span_streaming", [True, False])
-def test_request_url(sentry_init, capture_events, capture_items, span_streaming):
-    sentry_init(
-        traces_sample_rate=1.0,
-        integrations=[StarliteIntegration()],
-        send_default_pii=True,
-        _experiments={
-            "trace_lifecycle": "stream" if span_streaming else "static",
-        },
-    )
-
-    starlite_app = starlite_app_factory()
-    client = TestClient(
-        starlite_app, base_url="http://testserver.local", root_path="/root"
-    )
-
-    if span_streaming:
-        items = capture_items("span")
-
-        client.get("/nomessage")
-
-        sentry_sdk.flush()
-        spans = [item.payload for item in items]
-
-        (server_span,) = (
-            span
-            for span in spans
-            if span["attributes"].get("sentry.op") == "http.server"
-        )
-        assert server_span["attributes"]["url.full"] == (
-            "http://testserver.local/root/nomessage"
-        )
-    else:
-        events = capture_events()
-
-        client.get("/nomessage")
-
-        (event,) = events
-        assert event["request"]["url"] == "http://testserver.local/root/nomessage"