Fix test asserts

Follow-up to prometheus/client_golang#1424 Signed-off-by: György Krajcsovits <[email protected]>
grafana · Aug 30, 2024 · fa0d03b · fa0d03b
1 parent 062571c
commit fa0d03b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/pkg/querier/tenantfederation/merge_queryable_test.go b/pkg/querier/tenantfederation/merge_queryable_test.go
@@ -900,7 +900,7 @@ func TestMergeQueryable_LabelValues(t *testing.T) {
 					} else {
 						require.NoError(t, err)
 						assert.Equal(t, tc.expectedLabelValues, actLabelValues, fmt.Sprintf("unexpected values for label '%s'", tc.labelName))
-						assert.NoError(t, testutil.GatherAndCompare(reg, strings.NewReader(tc.expectedMetrics), "cortex_querier_federation_sample_tenants_queried"))
+						assert.NoError(t, testutil.GatherAndCompare(reg, strings.NewReader(tc.expectedMetrics), "cortex_querier_federation_tenants_queried"))
 						assertEqualWarnings(t, tc.expectedWarnings, warnings)
 					}
 				})

diff --git a/pkg/storage/ingest/partition_offset_client_test.go b/pkg/storage/ingest/partition_offset_client_test.go
@@ -409,9 +409,11 @@ func TestPartitionOffsetClient_FetchPartitionsLastProducedOffsets(t *testing.T)
 		require.NoError(t, err)
 		assert.Empty(t, offsets)
 
-		assert.NoError(t, promtest.GatherAndCompare(reg, strings.NewReader(""),
+		assert.ErrorContains(t, promtest.GatherAndCompare(reg, strings.NewReader(""),
 			"cortex_ingest_storage_reader_last_produced_offset_requests_total",
-			"cortex_ingest_storage_reader_last_produced_offset_failures_total"))
+			"cortex_ingest_storage_reader_last_produced_offset_failures_total"),
+			"expected metric name(s) not found",
+		)
 	})
 
 	t.Run("should honor context deadline and not fail other in-flight requests issued while the canceled one was still running", func(t *testing.T) {

diff --git a/pkg/streamingpromql/compat/fallback_engine_test.go b/pkg/streamingpromql/compat/fallback_engine_test.go
@@ -49,7 +49,12 @@ func TestEngineWithFallback(t *testing.T) {
 					# HELP cortex_mimir_query_engine_supported_queries_total Total number of queries that were supported by the Mimir query engine.
 					# TYPE cortex_mimir_query_engine_supported_queries_total counter
 					cortex_mimir_query_engine_supported_queries_total 1
-				`), "cortex_mimir_query_engine_supported_queries_total", "cortex_mimir_query_engine_unsupported_queries_total"))
+				`), "cortex_mimir_query_engine_supported_queries_total"))
+
+				require.ErrorContains(t, promtest.GatherAndCompare(reg, strings.NewReader(""),
+					"cortex_mimir_query_engine_unsupported_queries_total"),
+					"expected metric name(s) not found",
+				)
 			})
 
 			t.Run("should fall back for unsupported expressions", func(t *testing.T) {