Skip to content

Commit 22d72f0

Browse files
committed
Make sure to always consume the response
1 parent 2452820 commit 22d72f0

File tree

1 file changed

+17
-36
lines changed

1 file changed

+17
-36
lines changed

tests/integrations/django/test_basic.py

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_view_exceptions(sentry_init, client, capture_exceptions, capture_events
5151
sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
5252
exceptions = capture_exceptions()
5353
events = capture_events()
54-
client.get(reverse("view_exc"))
54+
unpack_werkzeug_response(client.get(reverse("view_exc")))
5555

5656
(error,) = exceptions
5757
assert isinstance(error, ZeroDivisionError)
@@ -72,7 +72,7 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
7272
sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
7373
exceptions = capture_exceptions()
7474
events = capture_events()
75-
client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
75+
unpack_werkzeug_response(client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}))
7676

7777
(error,) = exceptions
7878
assert isinstance(error, ZeroDivisionError)
@@ -91,7 +91,7 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
9191
sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
9292
exceptions = capture_exceptions()
9393
events = capture_events()
94-
client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
94+
unpack_werkzeug_response(client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"}))
9595

9696
(error,) = exceptions
9797
assert isinstance(error, ZeroDivisionError)
@@ -103,7 +103,7 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
103103
def test_middleware_exceptions(sentry_init, client, capture_exceptions):
104104
sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
105105
exceptions = capture_exceptions()
106-
client.get(reverse("middleware_exc"))
106+
unpack_werkzeug_response(client.get(reverse("middleware_exc")))
107107

108108
(error,) = exceptions
109109
assert isinstance(error, ZeroDivisionError)
@@ -932,7 +932,7 @@ def test_render_spans(sentry_init, client, capture_events, render_span_tree):
932932

933933
for url, expected_line in views_tests:
934934
events = capture_events()
935-
client.get(url)
935+
unpack_werkzeug_response(client.get(url))
936936
transaction = events[0]
937937
assert expected_line in render_span_tree(transaction)
938938

@@ -971,7 +971,7 @@ def test_middleware_spans(sentry_init, client, capture_events, render_span_tree)
971971
)
972972
events = capture_events()
973973

974-
client.get(reverse("message"))
974+
unpack_werkzeug_response(client.get(reverse("message")))
975975

976976
message, transaction = events
977977

@@ -988,7 +988,7 @@ def test_middleware_spans_disabled(sentry_init, client, capture_events):
988988
)
989989
events = capture_events()
990990

991-
client.get(reverse("message"))
991+
unpack_werkzeug_response(client.get(reverse("message")))
992992

993993
message, transaction = events
994994

@@ -1012,7 +1012,7 @@ def test_signals_spans(sentry_init, client, capture_events, render_span_tree):
10121012
)
10131013
events = capture_events()
10141014

1015-
client.get(reverse("message"))
1015+
unpack_werkzeug_response(client.get(reverse("message")))
10161016

10171017
message, transaction = events
10181018

@@ -1035,7 +1035,7 @@ def test_signals_spans_disabled(sentry_init, client, capture_events):
10351035
)
10361036
events = capture_events()
10371037

1038-
client.get(reverse("message"))
1038+
unpack_werkzeug_response(client.get(reverse("message")))
10391039

10401040
message, transaction = events
10411041

@@ -1065,7 +1065,7 @@ def test_signals_spans_filtering(sentry_init, client, capture_events, render_spa
10651065
)
10661066
events = capture_events()
10671067

1068-
client.get(reverse("send_myapp_custom_signal"))
1068+
unpack_werkzeug_response(client.get(reverse("send_myapp_custom_signal")))
10691069

10701070
(transaction,) = events
10711071

@@ -1190,9 +1190,7 @@ def test_span_origin(sentry_init, client, capture_events):
11901190
)
11911191
events = capture_events()
11921192

1193-
response = client.get(reverse("view_with_signal"))
1194-
# Close the response to ensure the WSGI cycle is complete and the transaction is finished
1195-
response.close()
1193+
unpack_werkzeug_response(client.get(reverse("view_with_signal")))
11961194

11971195
(transaction,) = events
11981196

@@ -1217,17 +1215,9 @@ def test_transaction_http_method_default(sentry_init, client, capture_events):
12171215
)
12181216
events = capture_events()
12191217

1220-
response = client.get("/nomessage")
1221-
# Close the response to ensure the WSGI cycle is complete and the transaction is finished
1222-
response.close()
1223-
1224-
response = client.options("/nomessage")
1225-
# Close the response to ensure the WSGI cycle is complete and the transaction is finished
1226-
response.close()
1227-
1228-
response = client.head("/nomessage")
1229-
# Close the response to ensure the WSGI cycle is complete and the transaction is finished
1230-
response.close()
1218+
unpack_werkzeug_response(client.get("/nomessage"))
1219+
unpack_werkzeug_response(client.options("/nomessage"))
1220+
unpack_werkzeug_response(client.head("/nomessage"))
12311221

12321222
(event,) = events
12331223

@@ -1249,18 +1239,9 @@ def test_transaction_http_method_custom(sentry_init, client, capture_events):
12491239
)
12501240
events = capture_events()
12511241

1252-
response = client.get("/nomessage")
1253-
# Close the response to ensure the WSGI cycle is complete and the transaction is finished
1254-
response.close()
1255-
1256-
response = client.options("/nomessage")
1257-
# Close the response to ensure the WSGI cycle is complete and the transaction is finished
1258-
response.close()
1259-
1260-
response = client.head("/nomessage")
1261-
# Close the response to ensure the WSGI cycle is complete and the transaction is finished
1262-
response.close()
1263-
1242+
unpack_werkzeug_response(client.get("/nomessage"))
1243+
unpack_werkzeug_response(client.options("/nomessage"))
1244+
unpack_werkzeug_response(client.head("/nomessage"))
12641245

12651246
assert len(events) == 2
12661247

0 commit comments

Comments
 (0)