From 5d79f736db841e6b7be2320403acc673377f99a0 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Thu, 13 Feb 2025 15:04:15 +0100 Subject: [PATCH 1/2] Fix clickhouse test --- .../clickhouse_driver/test_clickhouse_driver.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py index 3b07a82f03..f4ad52b0c2 100644 --- a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py +++ b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py @@ -211,7 +211,13 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) -> for crumb in event["breadcrumbs"]["values"]: crumb.pop("timestamp", None) - assert event["breadcrumbs"]["values"] == expected_breadcrumbs + actual_query_breadcrumbs = [ + breadcrumb + for breadcrumb in event["breadcrumbs"]["values"] + if breadcrumb["category"] == "query" + ] + + assert actual_query_breadcrumbs == expected_breadcrumbs def test_clickhouse_client_spans( From cdc527de2298ed6e8fe4ade8433e79385a82b36a Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Thu, 13 Feb 2025 15:10:54 +0100 Subject: [PATCH 2/2] wrong test --- .../clickhouse_driver/test_clickhouse_driver.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py index f4ad52b0c2..0675ad9ff5 100644 --- a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py +++ b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py @@ -109,7 +109,13 @@ def test_clickhouse_client_breadcrumbs(sentry_init, capture_events) -> None: for crumb in event["breadcrumbs"]["values"]: crumb.pop("timestamp", None) - assert event["breadcrumbs"]["values"] == expected_breadcrumbs + actual_query_breadcrumbs = [ + breadcrumb + for breadcrumb in event["breadcrumbs"]["values"] + if breadcrumb["category"] == "query" + ] + + assert actual_query_breadcrumbs == expected_breadcrumbs def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) -> None: @@ -211,13 +217,7 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) -> for crumb in event["breadcrumbs"]["values"]: crumb.pop("timestamp", None) - actual_query_breadcrumbs = [ - breadcrumb - for breadcrumb in event["breadcrumbs"]["values"] - if breadcrumb["category"] == "query" - ] - - assert actual_query_breadcrumbs == expected_breadcrumbs + assert event["breadcrumbs"]["values"] == expected_breadcrumbs def test_clickhouse_client_spans(