From 3892f6698072827506dfb04acdbf4c6d67a3879d Mon Sep 17 00:00:00 2001 From: "fansong.cfs" Date: Mon, 13 May 2019 15:00:16 +0800 Subject: [PATCH] fix data race in unittest --- .../apiserver/pkg/storage/cacher/cacher_whitebox_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go index a737b9ccb7a..b3de84633fb 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -678,12 +678,16 @@ func TestDispatchingBookmarkEventsWithConcurrentStop(t *testing.T) { t.Fatalf("failure to update version of object (%d) %#v", bookmark.ResourceVersion, bookmark.Object) } + wg := sync.WaitGroup{} + wg.Add(2) go func() { cacher.dispatchEvent(bookmark) + wg.Done() }() go func() { w.Stop() + wg.Done() }() done := make(chan struct{}) @@ -700,5 +704,6 @@ func TestDispatchingBookmarkEventsWithConcurrentStop(t *testing.T) { t.Fatal("receive result timeout") } w.Stop() + wg.Wait() } }