Mock time functions to make tests more reliable

pkg/util/aggregatingqueue/queue.go

@@ -6,30 +6,36 @@
 package queue
 
 import (
-	"time"
+	"github.com/benbjohnson/clock"
 )
 
 type queue[T any] struct {
+	clock            clock.Clock
 	maxNbItem        int
-	maxRetentionTime time.Duration
+	maxRetentionTime clock.Duration
 	flushCB          func([]T)
 	enqueueCh        chan T
 	data             []T
-	timer            *time.Timer
+	timer            *clock.Timer
 }
 
 // NewQueue returns a chan to enqueue elements
 // The flushCB function will be called with a slice of elements as soon as
 // * either maxNbItem elements have been enqueued since the last flush
 // * or maxRetentionTime has elapsed since the first element has been enqueued after the last flush.
-func NewQueue[T any](maxNbItem int, maxRetentionTime time.Duration, flushCB func([]T)) chan T {
+func NewQueue[T any](maxNbItem int, maxRetentionTime clock.Duration, flushCB func([]T)) chan T {
+	return newQueue(maxNbItem, maxRetentionTime, flushCB, clock.New())
+}
+
+func newQueue[T any](maxNbItem int, maxRetentionTime clock.Duration, flushCB func([]T), cl clock.Clock) chan T {
 	q := queue[T]{
+		clock:            cl,
 		maxNbItem:        maxNbItem,
 		maxRetentionTime: maxRetentionTime,
 		flushCB:          flushCB,
 		enqueueCh:        make(chan T),
 		data:             make([]T, 0, maxNbItem),
-		timer:            time.NewTimer(maxRetentionTime),
+		timer:            cl.Timer(maxRetentionTime),
 	}
 
 	if !q.timer.Stop() {

pkg/util/aggregatingqueue/queue_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/benbjohnson/clock"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -34,7 +35,8 @@ func newMockFlush[T any]() (callback func([]T), getAccumulator func() [][]T) {
 
 func TestQueue(t *testing.T) {
 	callback, accumulator := newMockFlush[int]()
-	queue := NewQueue(3, 50*time.Millisecond, callback)
+	cl := clock.NewMock()
+	queue := newQueue(3, 1*time.Minute, callback, cl)
 
 	for i := 0; i <= 10; i++ {
 		queue <- i
@@ -50,7 +52,7 @@ func TestQueue(t *testing.T) {
 		},
 	)
 
-	time.Sleep(100 * time.Millisecond)
+	cl.Add(2 * time.Minute)
 
 	assert.Equal(
 		t,