update usage of testutil.GatherAndCompare

Signed-off-by: Charlie Le <[email protected]>
cortexproject · Oct 27, 2024 · d711e1b · d711e1b
1 parent ef5a2ea
commit d711e1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/pkg/distributor/distributor_test.go b/pkg/distributor/distributor_test.go
@@ -559,9 +559,7 @@ func TestDistributor_MetricsCleanup(t *testing.T) {
 		cortex_distributor_ingester_query_failures_total{ingester="ingester-1"} 1
 		`), permanentMetrics...))
 
-	err = testutil.GatherAndCompare(reg, strings.NewReader(""), removedMetrics...)
-	require.ErrorContains(t, err, "expected metric name(s) not found")
-	require.ErrorContains(t, err, strings.Join(removedMetrics, " "))
+	require.NoError(t, testutil.GatherAndCompare(reg, strings.NewReader(""), removedMetrics...))
 }
 
 func TestDistributor_PushIngestionRateLimiter(t *testing.T) {

diff --git a/pkg/frontend/v1/frontend_test.go b/pkg/frontend/v1/frontend_test.go
@@ -216,7 +216,7 @@ func TestFrontendMetricsCleanup(t *testing.T) {
 
 			fr.cleanupInactiveUserMetrics("1")
 
-			require.ErrorContains(t, testutil.GatherAndCompare(reg, strings.NewReader(""), "cortex_query_frontend_queue_length"), "expected metric name(s) not found")
+			require.NoError(t, testutil.GatherAndCompare(reg, strings.NewReader(""), "cortex_query_frontend_queue_length"))
 		}
 
 		testFrontend(t, defaultFrontendConfig(), handler, test, matchMaxConcurrency, nil, reg)

diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go
@@ -4512,9 +4512,7 @@ func TestIngesterCompactAndCloseIdleTSDB(t *testing.T) {
 	require.Equal(t, int64(0), i.TSDBState.seriesCount.Load()) // Flushing removed all series from memory.
 
 	// Verify that user has disappeared from metrics.
-	err = testutil.GatherAndCompare(r, strings.NewReader(""), userMetrics...)
-	require.ErrorContains(t, err, "expected metric name(s) not found")
-	require.ErrorContains(t, err, strings.Join(userMetrics, " "))
+	require.NoError(t, testutil.GatherAndCompare(r, strings.NewReader(""), userMetrics...))
 
 	require.NoError(t, testutil.GatherAndCompare(r, strings.NewReader(`
 		# HELP cortex_ingester_memory_users The current number of users in memory.