In prometheus/client_golang#1424, a new check was introduced to make sure the metric with the provided metricName is found.

We were depending on it not erroring. This PR removes that assumption and instead makes sure the metric does no longer existi using the CollectAndCount function.

Signed-off-by: Tim Ramlot <[email protected]>

Author: inteon

pkg/metrics/certificates_test.go

@@ -363,16 +363,10 @@ func TestCertificateCache(t *testing.T) {
 		Namespace: "default-unit-test-ns",
 		Name:      "crt3",
 	})
-	if err := testutil.CollectAndCompare(m.certificateReadyStatus,
-		strings.NewReader(readyMetadata),
-		"certmanager_certificate_ready_status",
-	); err != nil {
-		t.Errorf("unexpected collecting result:\n%s", err)
+	if testutil.CollectAndCount(m.certificateReadyStatus, "certmanager_certificate_ready_status") != 0 {
+		t.Errorf("unexpected collecting result")
 	}
-	if err := testutil.CollectAndCompare(m.certificateExpiryTimeSeconds,
-		strings.NewReader(expiryMetadata),
-		"certmanager_certificate_expiration_timestamp_seconds",
-	); err != nil {
-		t.Errorf("unexpected collecting result:\n%s", err)
+	if testutil.CollectAndCount(m.certificateExpiryTimeSeconds, "certmanager_certificate_expiration_timestamp_seconds") != 0 {
+		t.Errorf("unexpected collecting result")
 	}
 }