From b8a285ed0bd6e9f5d03484b7242f10e9bf0b6d49 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 10 May 2023 15:59:51 +0200 Subject: [PATCH] test/extended/prometheus: fix test with enabled telemetry Telemetry tests were always skipped because nothing checked the first value returned by telemetryIsEnabled(). Signed-off-by: Simon Pasquier --- test/extended/prometheus/prometheus.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go index 612c20afe40f..5035a5c053bc 100644 --- a/test/extended/prometheus/prometheus.go +++ b/test/extended/prometheus/prometheus.go @@ -210,10 +210,10 @@ var _ = g.Describe("[sig-instrumentation][Late] Alerts", func() { }) g.It("shouldn't exceed the 650 series limit of total series sent via telemetry from each cluster", func() { - if enabled, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { + if enabledErr, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { e2e.Failf("could not determine if Telemetry is enabled: %v", err) - } else { - e2eskipper.Skipf("Telemetry is disabled: %v", enabled) + } else if enabledErr != nil { + e2eskipper.Skipf("Telemetry is disabled: %v", enabledErr) } // we only consider series sent since the beginning of the test @@ -275,10 +275,10 @@ var _ = g.Describe("[sig-instrumentation] Prometheus [apigroup:image.openshift.i g.Describe("when installed on the cluster", func() { g.It("should report telemetry [Late]", func() { - if enabled, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { + if enabledErr, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { e2e.Failf("could not determine if Telemetry is enabled: %v", err) - } else { - e2eskipper.Skipf("Telemetry is disabled: %v", enabled) + } else if enabledErr != nil { + e2eskipper.Skipf("Telemetry is disabled: %v", enabledErr) } tests := map[string]bool{}