Skip to content

Commit 3cd624c

Browse files
test(django): Reload middleware on test teardown
1 parent ccf4ea9 commit 3cd624c

1 file changed

Lines changed: 24 additions & 21 deletions

File tree

tests/integrations/django/test_basic.py

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,30 +1212,33 @@ def test_custom_urlconf_middleware(
12121212
)
12131213
events = capture_events()
12141214

1215-
content, status, _headers = unpack_werkzeug_response(client.get("/custom/ok"))
1216-
assert status.lower() == "200 ok"
1217-
assert content == b"custom ok"
1218-
1219-
event = events.pop(0)
1220-
assert event["transaction"] == "/custom/ok"
1221-
if middleware_spans:
1222-
assert "custom_urlconf_middleware" in render_span_tree(
1223-
event["spans"], event["contexts"]["trace"]
1224-
)
1215+
try:
1216+
content, status, _headers = unpack_werkzeug_response(client.get("/custom/ok"))
1217+
assert status.lower() == "200 ok"
1218+
assert content == b"custom ok"
1219+
1220+
event = events.pop(0)
1221+
assert event["transaction"] == "/custom/ok"
1222+
if middleware_spans:
1223+
assert "custom_urlconf_middleware" in render_span_tree(
1224+
event["spans"], event["contexts"]["trace"]
1225+
)
12251226

1226-
_content, status, _headers = unpack_werkzeug_response(client.get("/custom/exc"))
1227-
assert status.lower() == "500 internal server error"
1227+
_content, status, _headers = unpack_werkzeug_response(client.get("/custom/exc"))
1228+
assert status.lower() == "500 internal server error"
12281229

1229-
error_event, transaction_event = events
1230-
assert error_event["transaction"] == "/custom/exc"
1231-
assert error_event["exception"]["values"][-1]["mechanism"]["type"] == "django"
1232-
assert transaction_event["transaction"] == "/custom/exc"
1233-
if middleware_spans:
1234-
assert "custom_urlconf_middleware" in render_span_tree(
1235-
transaction_event["spans"], transaction_event["contexts"]["trace"]
1236-
)
1230+
error_event, transaction_event = events
1231+
assert error_event["transaction"] == "/custom/exc"
1232+
assert error_event["exception"]["values"][-1]["mechanism"]["type"] == "django"
1233+
assert transaction_event["transaction"] == "/custom/exc"
1234+
if middleware_spans:
1235+
assert "custom_urlconf_middleware" in render_span_tree(
1236+
transaction_event["spans"], transaction_event["contexts"]["trace"]
1237+
)
12371238

1238-
settings.MIDDLEWARE.pop(0)
1239+
finally:
1240+
settings.MIDDLEWARE.pop(0)
1241+
client.application.load_middleware()
12391242

12401243

12411244
def test_get_receiver_name():

0 commit comments

Comments
 (0)