From 8544c5932937788f0187a389fef37d743472aa1c Mon Sep 17 00:00:00 2001 From: Anastasia Lubennikova Date: Wed, 21 Dec 2022 18:31:52 +0200 Subject: [PATCH] Fix flaky test_metrics_collection.py Only check that all metrics are present on the first request, because pageserver doesn't send unchanged metrics. --- test_runner/regress/test_metric_collection.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test_runner/regress/test_metric_collection.py b/test_runner/regress/test_metric_collection.py index b171be3ac7..a3b3609153 100644 --- a/test_runner/regress/test_metric_collection.py +++ b/test_runner/regress/test_metric_collection.py @@ -22,6 +22,7 @@ def httpserver_listen_address(port_distributor: PortDistributor): num_metrics_received = 0 remote_uploaded = 0 +first_request = True # @@ -46,7 +47,12 @@ def metrics_handler(request: Request) -> Response: for event in events: assert checks.pop(event["metric"])(event["value"]), f"{event['metric']} isn't valid" - assert not checks, f"{' '.join(checks.keys())} wasn't/weren't received" + global first_request + # check that all checks were sent + # but only on the first request, because we don't send non-changed metrics + if first_request: + assert not checks, f"{' '.join(checks.keys())} wasn't/weren't received" + first_request = False global num_metrics_received num_metrics_received += 1