Skip to content

test(django): Prune redundant parametrize rows from the ASGI tests #7158

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

Draft
ericapisani wants to merge 3 commits into from
+24 −63
Draft

test(django): Prune redundant parametrize rows from the ASGI tests #7158

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faee270
test(django): Prune duplicate rows from test_asgi_request_body
ericapisani Aug 10, 2026
6f147f5
test(django): Drop middleware_spans parametrize from test_active_thre…
ericapisani Aug 10, 2026
7b83466
test(django): Use a local case table for the ASGI user identity test
ericapisani Aug 10, 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
87 changes: 24 additions & 63 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 @@ -17,7 +17,6 @@
from sentry_sdk.integrations.django.asgi import _asgi_middleware_mixin_factory
from tests.integrations.django.myapp.asgi import channels_application
from tests.integrations.django.utils import pytest_mark_django_db_decorator
from tests.integrations.utils import DATA_COLLECTION_USER_INFO_CASES

try:
from django.urls import reverse
Expand Down Expand Up @@ -199,7 +198,6 @@ async def test_async_views(

@pytest.mark.parametrize("application", APPS)
@pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
@pytest.mark.parametrize("middleware_spans", [False, True])
@pytest.mark.asyncio
@pytest.mark.skipif(
django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
Expand All @@ -212,11 +210,10 @@ async def test_active_thread_id(
teardown_profiling,
endpoint,
application,
middleware_spans,
span_streaming,
):
sentry_init(
integrations=[DjangoIntegration(middleware_spans=middleware_spans)],
integrations=[DjangoIntegration()],
traces_sample_rate=1.0,
profiles_sample_rate=1.0,
trace_lifecycle="stream" if span_streaming else "static",
Expand Down Expand Up @@ -668,85 +665,30 @@ async def test_trace_from_headers_if_performance_disabled(

@pytest.mark.parametrize("application", APPS)
@pytest.mark.parametrize(
"send_default_pii,method,headers,url_name,body,expected_data",
"method,headers,url_name,body,expected_data",
[
(
True,
"POST",
[(b"content-type", b"text/plain")],
"post_echo_async",
b"",
None,
),
(
True,
"POST",
[(b"content-type", b"text/plain")],
"post_echo_async",
b"some raw text body",
"",
),
(
True,
"POST",
[(b"content-type", b"application/json")],
"post_echo_async",
b'{"username":"xyz","password":"xyz"}',
{"username": "xyz", "password": "[Filtered]"},
),
(
True,
"POST",
[(b"content-type", b"application/xml")],
"post_echo_async",
b'<?xml version="1.0" encoding="UTF-8"?><root></root>',
"",
),
(
True,
"POST",
[
(b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"),
(b"content-length", BODY_FORM_CONTENT_LENGTH),
],
"post_echo_async",
BODY_FORM,
{"password": "[Filtered]", "photo": "", "username": "Jane"},
),
(
False,
"POST",
[(b"content-type", b"text/plain")],
"post_echo_async",
b"",
None,
),
(
False,
"POST",
[(b"content-type", b"text/plain")],
"post_echo_async",
b"some raw text body",
"",
),
(
False,
"POST",
[(b"content-type", b"application/json")],
"post_echo_async",
b'{"username":"xyz","password":"xyz"}',
{"username": "xyz", "password": "[Filtered]"},
),
(
False,
"POST",
[(b"content-type", b"application/xml")],
"post_echo_async",
b'<?xml version="1.0" encoding="UTF-8"?><root></root>',
"",
),
(
False,
"POST",
[
(b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"),
Expand All @@ -768,7 +710,6 @@ async def test_asgi_request_body(
capture_envelopes,
capture_items,
application,
send_default_pii,
method,
headers,
url_name,
Expand All @@ -778,7 +719,7 @@ async def test_asgi_request_body(
):
sentry_init(
integrations=[DjangoIntegration()],
send_default_pii=send_default_pii,
send_default_pii=True,
trace_lifecycle="stream" if span_streaming else "static",
)

Expand Down Expand Up @@ -1104,7 +1045,27 @@ async def test_async_middleware_process_exception_is_awaited(
@pytest.mark.skipif(
django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
)
@pytest.mark.parametrize("init_kwargs, expect_user", DATA_COLLECTION_USER_INFO_CASES)
# The full precedence table (data_collection winning over send_default_pii)
# is covered by the WSGI tests in test_data_scrubbing.py; here we only need
# each user-info branch of the ASGI middleware: legacy pii on/off and
# data_collection user_info on/off (asgi.py:75-83, _asgi_common.py:129-143).
@pytest.mark.parametrize(
"init_kwargs, expect_user",
[
pytest.param({"send_default_pii": True}, True, id="pii_on"),
pytest.param({"send_default_pii": False}, False, id="pii_off"),
pytest.param(
{"_experiments": {"data_collection": {"user_info": True}}},
True,
id="data_collection_user_info_on",
),
pytest.param(
{"_experiments": {"data_collection": {"user_info": False}}},
False,
id="data_collection_user_info_off",
),
],
)
@pytest_mark_django_db_decorator()
async def test_user_identity_error_event_data_collection(
sentry_init, capture_events, application, init_kwargs, expect_user
Expand Down
Loading