From 02d20442a5a5f5e1d3f1ef8e6fb14945462bc36c Mon Sep 17 00:00:00 2001 From: Huang Huang Date: Sun, 11 Apr 2021 11:29:15 +0800 Subject: [PATCH] Fix staticcheck failures for vendor/k8s.io/client-go/transport (#100429) * Fix staticcheck failures for vendor/k8s.io/client-go/transport * avoid the possibility of a hang --- hack/.staticcheck_failures | 1 - .../k8s.io/client-go/transport/token_source_test.go | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index fae15bb1e50..91385fed8f7 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -22,4 +22,3 @@ vendor/k8s.io/apiserver/pkg/util/webhook vendor/k8s.io/apiserver/pkg/util/wsstream vendor/k8s.io/client-go/rest vendor/k8s.io/client-go/rest/watch -vendor/k8s.io/client-go/transport diff --git a/staging/src/k8s.io/client-go/transport/token_source_test.go b/staging/src/k8s.io/client-go/transport/token_source_test.go index 2c55b2df02f..956ea7c5353 100644 --- a/staging/src/k8s.io/client-go/transport/token_source_test.go +++ b/staging/src/k8s.io/client-go/transport/token_source_test.go @@ -140,16 +140,23 @@ func TestCachingTokenSourceRace(t *testing.T) { var wg sync.WaitGroup wg.Add(100) + errc := make(chan error, 100) for i := 0; i < 100; i++ { go func() { defer wg.Done() if _, err := ts.Token(); err != nil { - t.Fatalf("err: %v", err) + errc <- err } }() } - wg.Wait() + go func() { + wg.Wait() + close(errc) + }() + if err, ok := <-errc; ok { + t.Fatalf("err: %v", err) + } if tts.calls != 1 { t.Errorf("expected one call to Token() but saw: %d", tts.calls) }