Skip to content

fix(tests): Remove redundant type filters after capture_items with args #6867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sentrivana wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(tests): Remove redundant type filters after capture_items with args #6867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
886c748
fix(tests): Remove redundant type filters after single-type capture_i…
sentrivana Jul 23, 2026
8ee81eb
ruff
sentrivana Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions tests/integrations/anthropic/test_anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4219,7 +4219,7 @@ def test_exception_message_create(
max_tokens=1024,
)

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
assert event["level"] == "error"
elif stream_gen_ai_spans:
items = capture_items("event", "transaction")
Expand Down Expand Up @@ -4469,7 +4469,7 @@ async def test_exception_message_create_async(
max_tokens=1024,
)

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
assert event["level"] == "error"
elif stream_gen_ai_spans:
items = capture_items("event", "transaction")
Expand Down Expand Up @@ -4772,7 +4772,7 @@ def mock_messages_create(*args, **kwargs):
)

sentry_sdk.flush()
span = next(item.payload for item in items if item.type == "span")
span = next(item.payload for item in items)

# Verify that the span was created correctly
assert span["attributes"]["sentry.op"] == "gen_ai.chat"
Expand Down Expand Up @@ -7467,7 +7467,7 @@ def test_cache_tokens_nonstreaming(
)

sentry_sdk.flush()
(span,) = (item.payload for item in items if item.type == "span")
(span,) = (item.payload for item in items)
# input_tokens normalized: 100 + 80 (cache_read) + 20 (cache_write) = 200
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 200
assert span["attributes"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 50
Expand Down Expand Up @@ -7550,7 +7550,7 @@ def test_input_tokens_include_cache_write_nonstreaming(
)

sentry_sdk.flush()
(span,) = (item.payload for item in items if item.type == "span")
(span,) = (item.payload for item in items)

# input_tokens should be total: 19 (non-cached) + 2846 (cache_write) = 2865
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 2865
Expand Down Expand Up @@ -7736,7 +7736,7 @@ def test_input_tokens_include_cache_read_streaming(
pass

sentry_sdk.flush()
(span,) = (item.payload for item in items if item.type == "span")
(span,) = (item.payload for item in items)

# input_tokens should be total: 19 + 2846 = test_stream_messages_input_tokens_include_cache_read_streaming
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 2865
Expand Down Expand Up @@ -7839,7 +7839,7 @@ def test_stream_messages_input_tokens_include_cache_read_streaming(
pass

sentry_sdk.flush()
(span,) = (item.payload for item in items if item.type == "span")
(span,) = (item.payload for item in items)

# input_tokens should be total: 19 + 2846 = 2865
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 2865
Expand Down Expand Up @@ -7922,7 +7922,7 @@ def test_input_tokens_unchanged_without_caching(
)

sentry_sdk.flush()
(span,) = (item.payload for item in items if item.type == "span")
(span,) = (item.payload for item in items)

assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 20
assert span["attributes"][SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS] == 32 # 20 + 12
Expand Down Expand Up @@ -8009,7 +8009,7 @@ def test_cache_tokens_streaming(
pass

sentry_sdk.flush()
(span,) = (item.payload for item in items if item.type == "span")
(span,) = (item.payload for item in items)
# input_tokens normalized: 100 + 80 (cache_read) + 20 (cache_write) = 200
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 200
assert span["attributes"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 10
Expand Down Expand Up @@ -8107,7 +8107,7 @@ def test_stream_messages_cache_tokens(
pass

sentry_sdk.flush()
(span,) = (item.payload for item in items if item.type == "span")
(span,) = (item.payload for item in items)
# input_tokens normalized: 100 + 80 (cache_read) + 20 (cache_write) = 200
assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 200
assert span["attributes"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 10
Expand Down
12 changes: 5 additions & 7 deletions tests/integrations/django/asgi/test_asgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ async def test_basic(

assert response["status"] == 500

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)

(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
Expand Down Expand Up @@ -174,7 +174,7 @@ async def test_async_views(

assert response["status"] == 200

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -524,7 +524,7 @@ async def test_has_trace_if_performance_disabled(
(
msg_event,
error_event,
) = (item.payload for item in items if item.type == "event")
) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -642,9 +642,7 @@ async def test_trace_from_headers_if_performance_disabled(

assert response["status"] == 500

(msg_event, error_event) = (
item.payload for item in items if item.type == "event"
)
(msg_event, error_event) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -800,7 +798,7 @@ async def test_asgi_request_body(
assert response["body"] == body

sentry_sdk.flush()
(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
envelopes = capture_envelopes()

Expand Down
44 changes: 22 additions & 22 deletions tests/integrations/django/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_view_exceptions(
(error,) = exceptions
assert isinstance(error, ZeroDivisionError)

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
client.get(reverse("view_exc"))
Expand Down Expand Up @@ -111,7 +111,7 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
(error,) = exceptions
assert isinstance(error, ZeroDivisionError)

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
Expand Down Expand Up @@ -149,7 +149,7 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(

(error,) = exceptions
assert isinstance(error, ZeroDivisionError)
(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
Expand Down Expand Up @@ -191,7 +191,7 @@ def test_request_captured(

assert content == b"ok"

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)

assert event["transaction"] == "/message"
assert event["request"] == {
Expand Down Expand Up @@ -242,7 +242,7 @@ def test_transaction_with_class_view(
)
assert status.lower() == "200 ok"

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
content, status, headers = unpack_werkzeug_response(
Expand Down Expand Up @@ -341,7 +341,7 @@ def test_has_trace_if_performance_disabled(
(
msg_event,
error_event,
) = (item.payload for item in items if item.type == "event")
) = (item.payload for item in items)
else:
events = capture_events()
client.head(reverse("view_exc_with_msg"))
Expand Down Expand Up @@ -457,7 +457,7 @@ def test_trace_from_headers_if_performance_disabled(
(
msg_event,
error_event,
) = (item.payload for item in items if item.type == "event")
) = (item.payload for item in items)
else:
events = capture_events()
client.head(
Expand Down Expand Up @@ -506,7 +506,7 @@ def test_user_captured(
)
assert content == b"ok"

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
content, status, headers = unpack_werkzeug_response(
Expand Down Expand Up @@ -587,7 +587,7 @@ def test_queryset_repr(
except Exception:
capture_exception()

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -630,7 +630,7 @@ def test_context_nested_queryset_repr(
except Exception:
capture_exception()

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -665,7 +665,7 @@ def test_custom_error_handler_request_context(
content, status, headers = unpack_werkzeug_response(client.post("/404"))
assert status.lower() == "404 not found"

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
content, status, headers = unpack_werkzeug_response(client.post("/404"))
Expand Down Expand Up @@ -735,7 +735,7 @@ def test_sql_queries(

capture_message("HI")

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -792,7 +792,7 @@ def test_sql_dict_query_params(

capture_message("HI")

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
sentry_sdk.get_isolation_scope().clear_breadcrumbs()
Expand Down Expand Up @@ -905,7 +905,7 @@ def test_sql_psycopg2_string_composition(

capture_message("HI")

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -969,7 +969,7 @@ def test_sql_psycopg2_placeholders(

capture_message("HI")

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
sentry_sdk.get_isolation_scope().clear_breadcrumbs()
Expand Down Expand Up @@ -1117,7 +1117,7 @@ def test_django_connect_breadcrumbs(

# trigger recording of event.
capture_message("HI")
(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -1313,7 +1313,7 @@ def test_request_body(
assert status.lower() == "200 ok"
assert content == b"heyooo"

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)

assert event["message"] == "hi"
assert event["request"]["data"] == ""
Expand All @@ -1333,7 +1333,7 @@ def test_request_body(
assert status.lower() == "200 ok"
assert content == b'{"hey": 42}'

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()
content, status, headers = unpack_werkzeug_response(
Expand Down Expand Up @@ -1395,7 +1395,7 @@ def test_read_request(

assert status.lower() == "500 internal server error"

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -1443,7 +1443,7 @@ def raw_data(self):
content_type="application/json",
)

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)

else:
events = capture_events()
Expand Down Expand Up @@ -1525,7 +1525,7 @@ def test_template_exception(
)
assert status.lower() == "500 internal server error"

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
events = capture_events()

Expand Down Expand Up @@ -1617,7 +1617,7 @@ def test_rest_framework_basic(
(error,) = exceptions
assert isinstance(error, ZeroDivisionError)

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
else:
exceptions = capture_exceptions()
events = capture_events()
Expand Down
10 changes: 5 additions & 5 deletions tests/integrations/django/test_data_scrubbing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_scrub_django_session_cookies_removed(
werkzeug_set_cookie(client, "localhost", "foo", "bar")
client.get(reverse("view_exc"))

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
assert "cookies" not in event["request"]


Expand All @@ -63,7 +63,7 @@ def test_scrub_django_session_cookies_filtered(
werkzeug_set_cookie(client, "localhost", "foo", "bar")
client.get(reverse("view_exc"))

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
assert event["request"]["cookies"] == {
"sessionid": "[Filtered]",
"csrftoken": "[Filtered]",
Expand Down Expand Up @@ -95,7 +95,7 @@ def test_scrub_django_custom_session_cookies_filtered(
werkzeug_set_cookie(client, "localhost", "foo", "bar")
client.get(reverse("view_exc"))

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
assert event["request"]["cookies"] == {
"my_sess": "[Filtered]",
"csrf_secret": "[Filtered]",
Expand Down Expand Up @@ -185,7 +185,7 @@ def test_data_collection_cookies(
werkzeug_set_cookie(client, "localhost", name, value)
client.get(reverse("view_exc"))

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
if expected_cookies is None:
assert "cookies" not in event["request"]
else:
Expand All @@ -210,7 +210,7 @@ def test_data_collection_cookies_precedence_over_send_default_pii(
werkzeug_set_cookie(client, "localhost", "foo", "bar")
client.get(reverse("view_exc"))

(event,) = (item.payload for item in items if item.type == "event")
(event,) = (item.payload for item in items)
assert event["request"]["cookies"] == {
"sessionid": "[Filtered]",
"csrftoken": "[Filtered]",
Expand Down
Loading
Loading