From b884b15f39053f355135bd93381c913c2d73a6bc Mon Sep 17 00:00:00 2001 From: Alex Greenbank Date: Tue, 19 Mar 2024 18:28:20 +0000 Subject: [PATCH] Fix race in test Signed-off-by: Alex Greenbank --- storage/remote/queue_manager_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/storage/remote/queue_manager_test.go b/storage/remote/queue_manager_test.go index 7fac789166..c76143c848 100644 --- a/storage/remote/queue_manager_test.go +++ b/storage/remote/queue_manager_test.go @@ -179,12 +179,17 @@ func TestContentNegotiation(t *testing.T) { c.expectSamples(samples, series) } qm.Append(samples) + if !tc.success { // We just need to sleep for a bit to give it time to run time.Sleep(2 * time.Second) + // But we still need to check for data with no delay to avoid race + c.waitForExpectedData(t, 0*time.Second) } else { - c.waitForExpectedData(t, 2*time.Second) + // We expected data so wait for it + c.waitForExpectedData(t, 5*time.Second) } + require.Equal(t, len(c.sendAttempts), len(tc.steps)) for i, s := range c.sendAttempts { require.Equal(t, s, tc.steps[i].attemptString)