From 7b7d375f867675c4bb6808400db2ad8c9bad0d52 Mon Sep 17 00:00:00 2001 From: David Grant Date: Thu, 20 Jun 2024 15:50:37 -0700 Subject: [PATCH] Adjust test now that we're not closing the channel. --- pkg/scheduler/queue/queue_test.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/scheduler/queue/queue_test.go b/pkg/scheduler/queue/queue_test.go index fd8382cbd26..d903aad1567 100644 --- a/pkg/scheduler/queue/queue_test.go +++ b/pkg/scheduler/queue/queue_test.go @@ -622,8 +622,8 @@ func TestRequestQueue_GetNextRequestForQuerier_ShouldReturnImmediatelyIfQuerierI require.EqualError(t, err, "querier has informed the scheduler it is shutting down") } -func TestRequestQueue_GetNextRequestForQuerier_ShouldReturnErrorIfChanClosed(t *testing.T) { - // This tests a rare (~5 in 100K test runs) race where a closed querier +func TestRequestQueue_GetNextRequestForQuerier_ShouldReturnErrorIfCtxCanceled(t *testing.T) { + // This tests a rare (~5 in 100K test runs) race where a canceled querier // context results in WaitForRequestForQuerier returning no error yet a nil // request. @@ -660,9 +660,8 @@ func TestRequestQueue_GetNextRequestForQuerier_ShouldReturnErrorIfChanClosed(t * cctx, cancel := context.WithCancel(ctx) cancel() // Cancel it right away. r, _, qerr := queue.WaitForRequestForQuerier(cctx, FirstTenant(), "querier-1") - if qerr == nil && r == nil { - t.Error("queue returned nil request with no error") - } + require.Error(t, qerr) + require.Nil(t, r) } func TestRequestQueue_tryDispatchRequestToQuerier_ShouldReEnqueueAfterFailedSendToQuerier(t *testing.T) {