From 268c2f81c7ab94cbab68a8d6c00725144b81fa09 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Fri, 26 Jun 2020 10:45:30 -0500 Subject: [PATCH] fix S1000 simplify ch switch cases Signed-off-by: Ken Sipe --- .../flowcontrol/fairqueuing/queueset/queueset_test.go | 4 +--- .../flowcontrol/fairqueuing/testing/clock/event_clock.go | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go index e9c700efcc4..cc02f27a19f 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go @@ -195,9 +195,7 @@ func ClockWait(clk *clock.FakeEventClock, counter counter.GoRoutineCounter, dura close(dunch) }, duration) counter.Add(-1) - select { - case <-dunch: - } + <-dunch } func init() { diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go index 376405433b9..d45a35e5257 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go @@ -25,8 +25,9 @@ import ( "time" "k8s.io/apimachinery/pkg/util/clock" - "k8s.io/apiserver/pkg/util/flowcontrol/counter" "k8s.io/klog/v2" + + "k8s.io/apiserver/pkg/util/flowcontrol/counter" ) // EventFunc does some work that needs to be done at or after the @@ -51,10 +52,8 @@ type RealEventClock struct { func (RealEventClock) EventAfterDuration(f EventFunc, d time.Duration) { ch := time.After(d) go func() { - select { - case t := <-ch: - f(t) - } + t := <-ch + f(t) }() }