Fixing tests

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
grafana · Jun 8, 2022 · 34d6d99 · 34d6d99
1 parent 65642c3
commit 34d6d99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/pkg/storage/chunk/cache/fifo_cache.go b/pkg/storage/chunk/cache/fifo_cache.go
@@ -95,7 +95,7 @@ type FifoCache struct {
 }
 
 const (
-	expiredReason string = "expired"
+	expiredReason string = "expired" //nolint:staticcheck
 	fullReason           = "full"
 	tooBigReason         = "too big"
 	stoppedReason        = "stopped"

diff --git a/pkg/storage/chunk/cache/fifo_cache_test.go b/pkg/storage/chunk/cache/fifo_cache_test.go
@@ -55,9 +55,11 @@ func TestFifoCacheEviction(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, c.entries, cnt)
 
+		reason := fullReason
+
 		assert.Equal(t, testutil.ToFloat64(c.entriesAdded), float64(1))
 		assert.Equal(t, testutil.ToFloat64(c.entriesAddedNew), float64(cnt))
-		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted), float64(0))
+		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted.WithLabelValues(reason)), float64(0))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(cnt))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(len(c.entries)))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(c.lru.Len()))
@@ -98,7 +100,7 @@ func TestFifoCacheEviction(t *testing.T) {
 
 		assert.Equal(t, testutil.ToFloat64(c.entriesAdded), float64(2))
 		assert.Equal(t, testutil.ToFloat64(c.entriesAddedNew), float64(cnt+evicted))
-		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted), float64(evicted))
+		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted.WithLabelValues(reason)), float64(evicted))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(cnt))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(len(c.entries)))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(c.lru.Len()))
@@ -119,7 +121,7 @@ func TestFifoCacheEviction(t *testing.T) {
 
 		assert.Equal(t, testutil.ToFloat64(c.entriesAdded), float64(2))
 		assert.Equal(t, testutil.ToFloat64(c.entriesAddedNew), float64(cnt+evicted))
-		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted), float64(evicted))
+		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted.WithLabelValues(reason)), float64(evicted))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(cnt))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(len(c.entries)))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(c.lru.Len()))
@@ -149,7 +151,7 @@ func TestFifoCacheEviction(t *testing.T) {
 
 		assert.Equal(t, testutil.ToFloat64(c.entriesAdded), float64(3))
 		assert.Equal(t, testutil.ToFloat64(c.entriesAddedNew), float64(cnt+evicted))
-		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted), float64(evicted))
+		assert.Equal(t, testutil.ToFloat64(c.entriesEvicted.WithLabelValues(reason)), float64(evicted))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(cnt))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(len(c.entries)))
 		assert.Equal(t, testutil.ToFloat64(c.entriesCurrent), float64(c.lru.Len()))
@@ -208,7 +210,8 @@ func TestFifoCacheExpiry(t *testing.T) {
 
 			assert.Equal(t, float64(1), testutil.ToFloat64(c.entriesAdded))
 			assert.Equal(t, float64(4), testutil.ToFloat64(c.entriesAddedNew))
-			assert.Equal(t, float64(1), testutil.ToFloat64(c.entriesEvicted))
+			assert.Equal(t, float64(0), testutil.ToFloat64(c.entriesEvicted.WithLabelValues(expiredReason)))
+			assert.Equal(t, float64(1), testutil.ToFloat64(c.entriesEvicted.WithLabelValues(fullReason)))
 			assert.Equal(t, float64(3), testutil.ToFloat64(c.entriesCurrent))
 			assert.Equal(t, float64(len(c.entries)), testutil.ToFloat64(c.entriesCurrent))
 			assert.Equal(t, float64(c.lru.Len()), testutil.ToFloat64(c.entriesCurrent))
@@ -223,7 +226,8 @@ func TestFifoCacheExpiry(t *testing.T) {
 
 			assert.Equal(t, float64(1), testutil.ToFloat64(c.entriesAdded))
 			assert.Equal(t, float64(4), testutil.ToFloat64(c.entriesAddedNew))
-			assert.Equal(t, float64(4), testutil.ToFloat64(c.entriesEvicted))
+			assert.Equal(t, float64(3), testutil.ToFloat64(c.entriesEvicted.WithLabelValues(expiredReason)))
+			assert.Equal(t, float64(1), testutil.ToFloat64(c.entriesEvicted.WithLabelValues(fullReason)))
 			assert.Equal(t, float64(0), testutil.ToFloat64(c.entriesCurrent))
 			assert.Equal(t, float64(len(c.entries)), testutil.ToFloat64(c.entriesCurrent))
 			assert.Equal(t, float64(c.lru.Len()), testutil.ToFloat64(c.entriesCurrent))