remove time.Sleep from tests (#1305)

Author: 3vilhamster

internal/common/cache/lru.go

@@ -41,6 +41,8 @@ type lru struct {
 	ttl      time.Duration
 	pin      bool
 	rmFunc   RemovedFunc
+	// We use this instead of time.Now() in order to make testing easier
+	now func() time.Time
 }
 
 // New creates a new cache with the given options
@@ -56,6 +58,7 @@ func New(maxSize int, opts *Options) Cache {
 		maxSize:  maxSize,
 		pin:      opts.Pin,
 		rmFunc:   opts.RemovedFunc,
+		now:      time.Now,
 	}
 }
 
@@ -97,7 +100,7 @@ func (c *lru) Get(key string) interface{} {
 		cacheEntry.refCount++
 	}
 
-	if cacheEntry.refCount == 0 && !cacheEntry.expiration.IsZero() && time.Now().After(cacheEntry.expiration) {
+	if cacheEntry.refCount == 0 && !cacheEntry.expiration.IsZero() && c.now().After(cacheEntry.expiration) {
 		// Entry has expired
 		if c.rmFunc != nil {
 			go c.rmFunc(cacheEntry.value)
@@ -182,7 +185,7 @@ func (c *lru) putInternal(key string, value interface{}, allowUpdate bool) (inte
 			entry.value = value
 		}
 		if c.ttl != 0 {
-			entry.expiration = time.Now().Add(c.ttl)
+			entry.expiration = c.now().Add(c.ttl)
 		}
 		c.byAccess.MoveToFront(elt)
 		if c.pin {
@@ -201,7 +204,7 @@ func (c *lru) putInternal(key string, value interface{}, allowUpdate bool) (inte
 	}
 
 	if c.ttl != 0 {
-		entry.expiration = time.Now().Add(c.ttl)
+		entry.expiration = c.now().Add(c.ttl)
 	}
 
 	c.byKey[key] = c.byAccess.PushFront(entry)

internal/common/cache/lru_test.go

@@ -65,10 +65,17 @@ func TestLRU(t *testing.T) {
 func TestLRUWithTTL(t *testing.T) {
 	cache := New(5, &Options{
 		TTL: time.Millisecond * 100,
-	})
+	}).(*lru)
+
+	// We will capture this in the caches now function, and advance time as needed
+	currentTime := time.UnixMilli(0)
+	cache.now = func() time.Time { return currentTime }
+
 	cache.Put("A", "foo")
 	assert.Equal(t, "foo", cache.Get("A"))
-	time.Sleep(time.Millisecond * 300)
+
+	currentTime = currentTime.Add(time.Millisecond * 300)
+
 	assert.Nil(t, cache.Get("A"))
 	assert.Equal(t, 0, cache.Size())
 }
@@ -139,18 +146,23 @@ func TestRemovedFuncWithTTL(t *testing.T) {
 			assert.True(t, ok)
 			ch <- true
 		},
-	})
+	}).(*lru)
+
+	// We will capture this in the caches now function, and advance time as needed
+	currentTime := time.UnixMilli(0)
+	cache.now = func() time.Time { return currentTime }
 
 	cache.Put("A", t)
 	assert.Equal(t, t, cache.Get("A"))
-	time.Sleep(time.Millisecond * 100)
+
+	currentTime = currentTime.Add(time.Millisecond * 100)
+
 	assert.Nil(t, cache.Get("A"))
 
-	timeout := time.NewTimer(time.Millisecond * 300)
 	select {
 	case b := <-ch:
 		assert.True(t, b)
-	case <-timeout.C:
+	case <-time.After(100 * time.Millisecond):
 		t.Error("RemovedFunc did not send true on channel ch")
 	}
 }