diff --git a/rest/request_test.go b/rest/request_test.go index 8575f570..dcdc0edb 100644 --- a/rest/request_test.go +++ b/rest/request_test.go @@ -54,6 +54,7 @@ import ( restclientwatch "k8s.io/client-go/rest/watch" "k8s.io/client-go/util/flowcontrol" utiltesting "k8s.io/client-go/util/testing" + testingclock "k8s.io/utils/clock/testing" ) func TestNewRequestSetsAccept(t *testing.T) { @@ -1563,7 +1564,7 @@ func TestBackoffLifecycle(t *testing.T) { // which are used in the server implementation returning StatusOK above. seconds := []int{0, 1, 2, 4, 8, 0, 1, 2, 4, 0} request := c.Verb("POST").Prefix("backofftest").Suffix("abc") - clock := clock.FakeClock{} + clock := testingclock.FakeClock{} request.backoff = &URLBackoff{ // Use a fake backoff here to avoid flakes and speed the test up. Backoff: flowcontrol.NewFakeBackOff( diff --git a/util/flowcontrol/backoff.go b/util/flowcontrol/backoff.go index c48ba03e..ca60e107 100644 --- a/util/flowcontrol/backoff.go +++ b/util/flowcontrol/backoff.go @@ -20,7 +20,8 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" + testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/integer" ) @@ -37,7 +38,7 @@ type Backoff struct { perItemBackoff map[string]*backoffEntry } -func NewFakeBackOff(initial, max time.Duration, tc *clock.FakeClock) *Backoff { +func NewFakeBackOff(initial, max time.Duration, tc *testingclock.FakeClock) *Backoff { return &Backoff{ perItemBackoff: map[string]*backoffEntry{}, Clock: tc, diff --git a/util/flowcontrol/backoff_test.go b/util/flowcontrol/backoff_test.go index 4d061d54..08f60d0e 100644 --- a/util/flowcontrol/backoff_test.go +++ b/util/flowcontrol/backoff_test.go @@ -20,12 +20,12 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + testingclock "k8s.io/utils/clock/testing" ) func TestSlowBackoff(t *testing.T) { id := "_idSlow" - tc := clock.NewFakeClock(time.Now()) + tc := testingclock.NewFakeClock(time.Now()) step := time.Second maxDuration := 50 * step @@ -51,7 +51,7 @@ func TestSlowBackoff(t *testing.T) { func TestBackoffReset(t *testing.T) { id := "_idReset" - tc := clock.NewFakeClock(time.Now()) + tc := testingclock.NewFakeClock(time.Now()) step := time.Second maxDuration := step * 5 b := NewFakeBackOff(step, maxDuration, tc) @@ -77,7 +77,7 @@ func TestBackoffReset(t *testing.T) { func TestBackoffHighWaterMark(t *testing.T) { id := "_idHiWaterMark" - tc := clock.NewFakeClock(time.Now()) + tc := testingclock.NewFakeClock(time.Now()) step := time.Second maxDuration := 5 * step b := NewFakeBackOff(step, maxDuration, tc) @@ -99,7 +99,7 @@ func TestBackoffHighWaterMark(t *testing.T) { func TestBackoffGC(t *testing.T) { id := "_idGC" - tc := clock.NewFakeClock(time.Now()) + tc := testingclock.NewFakeClock(time.Now()) step := time.Second maxDuration := 5 * step @@ -127,7 +127,7 @@ func TestBackoffGC(t *testing.T) { func TestIsInBackOffSinceUpdate(t *testing.T) { id := "_idIsInBackOffSinceUpdate" - tc := clock.NewFakeClock(time.Now()) + tc := testingclock.NewFakeClock(time.Now()) step := time.Second maxDuration := 10 * step b := NewFakeBackOff(step, maxDuration, tc)