From 2ebb8f998da586073984338cf1106e1406a15d44 Mon Sep 17 00:00:00 2001 From: Steve Simpson Date: Fri, 9 Jul 2021 12:12:50 +0200 Subject: [PATCH] Attempt at making SyncOnRingTopologyChanges test more reliable. It was only waiting one second for the second sync to complete, which is probably too harsh a deadline than necessary for overloaded systems. Signed-off-by: Steve Simpson --- pkg/alertmanager/multitenant_test.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkg/alertmanager/multitenant_test.go b/pkg/alertmanager/multitenant_test.go index dc60301eb8..d8af49e996 100644 --- a/pkg/alertmanager/multitenant_test.go +++ b/pkg/alertmanager/multitenant_test.go @@ -1325,18 +1325,15 @@ func TestMultitenantAlertmanager_SyncOnRingTopologyChanges(t *testing.T) { return ringDesc, true, nil })) - // Assert if we expected a sync or not. + // Assert if we expected an additional sync or not. + expectedSyncs := 1 if tt.expected { - test.Poll(t, time.Second, float64(2), func() interface{} { - metrics := regs.BuildMetricFamiliesPerUser() - return metrics.GetSumOfCounters("cortex_alertmanager_sync_configs_total") - }) - } else { - time.Sleep(250 * time.Millisecond) - - metrics := regs.BuildMetricFamiliesPerUser() - assert.Equal(t, float64(1), metrics.GetSumOfCounters("cortex_alertmanager_sync_configs_total")) + expectedSyncs++ } + test.Poll(t, 5*time.Second, float64(expectedSyncs), func() interface{} { + metrics := regs.BuildMetricFamiliesPerUser() + return metrics.GetSumOfCounters("cortex_alertmanager_sync_configs_total") + }) }) } }