replace time.Now().Sub with time.Since

Kubernetes-commit: 5c9f4d9dc67b28fb31fd95f88448c09150a4cbfb
This commit is contained in:
shinytang6 2019-03-18 23:57:26 +08:00 committed by Kubernetes Publisher
parent 6a49eed407
commit 861da69465
3 changed files with 4 additions and 4 deletions

View File

@ -363,7 +363,7 @@ loop:
} }
} }
watchDuration := r.clock.Now().Sub(start) watchDuration := r.clock.Since(start)
if watchDuration < 1*time.Second && eventCount == 0 { if watchDuration < 1*time.Second && eventCount == 0 {
return fmt.Errorf("very short watch: %s: Unexpected watch close - watch lasted less than a second and no items received", r.name) return fmt.Errorf("very short watch: %s: Unexpected watch close - watch lasted less than a second and no items received", r.name)
} }

View File

@ -99,7 +99,7 @@ func (p *Backoff) IsInBackOffSince(id string, eventTime time.Time) bool {
if hasExpired(eventTime, entry.lastUpdate, p.maxDuration) { if hasExpired(eventTime, entry.lastUpdate, p.maxDuration) {
return false return false
} }
return p.Clock.Now().Sub(eventTime) < entry.backoff return p.Clock.Since(eventTime) < entry.backoff
} }
// Returns True if time since lastupdate is less than the current backoff window. // Returns True if time since lastupdate is less than the current backoff window.

View File

@ -114,14 +114,14 @@ func TestBackoffGC(t *testing.T) {
b.GC() b.GC()
_, found := b.perItemBackoff[id] _, found := b.perItemBackoff[id]
if !found { if !found {
t.Errorf("expected GC to skip entry, elapsed time=%s maxDuration=%s", tc.Now().Sub(lastUpdate), maxDuration) t.Errorf("expected GC to skip entry, elapsed time=%s maxDuration=%s", tc.Since(lastUpdate), maxDuration)
} }
tc.Step(maxDuration + step) tc.Step(maxDuration + step)
b.GC() b.GC()
r, found := b.perItemBackoff[id] r, found := b.perItemBackoff[id]
if found { if found {
t.Errorf("expected GC of entry after %s got entry %v", tc.Now().Sub(lastUpdate), r) t.Errorf("expected GC of entry after %s got entry %v", tc.Since(lastUpdate), r)
} }
} }