Skip to content

Commit bf18700

Browse files
test(django): Strictly order cache spans to avoid flakes
1 parent c12eb30 commit bf18700

1 file changed

Lines changed: 17 additions & 8 deletions

File tree

‎tests/integrations/django/test_cache_module.py‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,6 @@ def test_cache_spans_decorator(
370370
items = capture_items("span")
371371

372372
client.get(reverse("cached_view"))
373-
client.get(reverse("cached_view"))
374-
375373
sentry_sdk.flush()
376374
spans = [item.payload for item in items]
377375
# first_event - cache.get
@@ -392,6 +390,10 @@ def test_cache_spans_decorator(
392390
)
393391
assert "cache.hit" not in spans[1]["attributes"]
394392
assert spans[1]["attributes"]["cache.item_size"] == 2
393+
394+
client.get(reverse("cached_view"))
395+
sentry_sdk.flush()
396+
spans = [item.payload for item in items]
395397
# second_event - cache.get
396398
assert spans[5]["attributes"]["sentry.op"] == "cache.get"
397399
assert spans[5]["name"].startswith("views.decorators.cache.cache_page.")
@@ -470,11 +472,8 @@ def test_cache_spans_templatetag(
470472
items = capture_items("span")
471473

472474
client.get(reverse("view_with_cached_template_fragment"))
473-
client.get(reverse("view_with_cached_template_fragment"))
474-
475475
sentry_sdk.flush()
476476
spans = [item.payload for item in items]
477-
assert len(spans) == 5
478477
# first_event - cache.get
479478
assert spans[0]["attributes"]["sentry.op"] == "cache.get"
480479
assert spans[0]["name"].startswith("template.cache.some_identifier.")
@@ -493,6 +492,12 @@ def test_cache_spans_templatetag(
493492
)
494493
assert "cache.hit" not in spans[1]["attributes"]
495494
assert spans[1]["attributes"]["cache.item_size"] == 51
495+
496+
client.get(reverse("view_with_cached_template_fragment"))
497+
sentry_sdk.flush()
498+
spans = [item.payload for item in items]
499+
500+
assert len(spans) == 5
496501
# second_event - cache.get
497502
assert spans[3]["attributes"]["sentry.op"] == "cache.get"
498503
assert spans[3]["name"].startswith("template.cache.some_identifier.")
@@ -754,11 +759,9 @@ def test_cache_spans_item_size(
754759
items = capture_items("span")
755760

756761
client.get(reverse("cached_view"))
757-
client.get(reverse("cached_view"))
758-
759762
sentry_sdk.flush()
760763
spans = [item.payload for item in items]
761-
assert len(spans) == 7
764+
762765
assert spans[0]["attributes"]["sentry.op"] == "cache.get"
763766
assert not spans[0]["attributes"]["cache.hit"]
764767
assert "cache.item_size" not in spans[0]["attributes"]
@@ -771,6 +774,12 @@ def test_cache_spans_item_size(
771774
assert "cache.hit" not in spans[2]["attributes"]
772775
assert spans[2]["attributes"]["cache.item_size"] == 58
773776

777+
client.get(reverse("cached_view"))
778+
sentry_sdk.flush()
779+
spans = [item.payload for item in items]
780+
781+
assert len(spans) == 7
782+
774783
assert spans[4]["attributes"]["sentry.op"] == "cache.get"
775784
assert spans[4]["attributes"]["cache.hit"]
776785
assert spans[4]["attributes"]["cache.item_size"] == 2

0 commit comments

Comments
 (0)