From 96688b36d577a8769f823e346f52d7e63abab2ac Mon Sep 17 00:00:00 2001 From: Johan Brandhorst-Satzkorn Date: Tue, 27 Aug 2024 11:00:04 -0700 Subject: [PATCH] internal/daemon: simplify time update tests (#5041) Using time.After makes the intent clearer --- internal/daemon/controller/testing.go | 2 +- internal/daemon/worker/status.go | 2 +- internal/daemon/worker/worker.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/daemon/controller/testing.go b/internal/daemon/controller/testing.go index c647d65258..41dc57d2ba 100644 --- a/internal/daemon/controller/testing.go +++ b/internal/daemon/controller/testing.go @@ -937,7 +937,7 @@ func (tc *TestController) WaitForNextWorkerStatusUpdate(workerStatusName string) break } - if waitStatusCurrent.Sub(waitStatusStart) > 0 { + if waitStatusCurrent.After(waitStatusStart) { break } } diff --git a/internal/daemon/worker/status.go b/internal/daemon/worker/status.go index 64453f99a7..dbddbc8b2b 100644 --- a/internal/daemon/worker/status.go +++ b/internal/daemon/worker/status.go @@ -106,7 +106,7 @@ func (w *Worker) WaitForNextSuccessfulStatusUpdate() error { return ctx.Err() } - if w.lastSuccessfulStatusTime().Sub(waitStatusStart) > 0 { + if w.lastSuccessfulStatusTime().After(waitStatusStart) { break } } diff --git a/internal/daemon/worker/worker.go b/internal/daemon/worker/worker.go index 002e52c9de..5b4a77d8db 100644 --- a/internal/daemon/worker/worker.go +++ b/internal/daemon/worker/worker.go @@ -711,7 +711,7 @@ func (w *Worker) Shutdown() error { break } - if w.lastSuccessfulStatusTime().Sub(waitStatusStart) > 0 { + if w.lastSuccessfulStatusTime().After(waitStatusStart) { break }