From b78baaad5ff4bcaf12e5de9e7e35f8fadba1c25b Mon Sep 17 00:00:00 2001 From: Mike Spreitzer Date: Tue, 31 Aug 2021 17:40:03 -0400 Subject: [PATCH] Remove race condition from TestApfExecuteWatchRequestsWithInitializationSignal --- .../pkg/server/filters/priority-and-fairness_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go index c84345c0f97..c57123ede0b 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go @@ -476,9 +476,7 @@ func TestApfExecuteWatchRequestsWithInitializationSignal(t *testing.T) { onExecuteFunc := func() { firstRunning.Done() - firstRunning.Wait() - sendSignals() fakeFilter.wait() allRunning.Done() @@ -502,9 +500,10 @@ func TestApfExecuteWatchRequestsWithInitializationSignal(t *testing.T) { } firstRunning.Wait() + sendSignals() fakeFilter.wait() - firstRunning.Add(concurrentRequests) + for i := 0; i < concurrentRequests; i++ { go func() { defer wg.Done() @@ -513,6 +512,8 @@ func TestApfExecuteWatchRequestsWithInitializationSignal(t *testing.T) { } }() } + firstRunning.Wait() + sendSignals() wg.Wait() }