From 84c597495586d9d87e36c20c6d9c5e433878035a Mon Sep 17 00:00:00 2001 From: Forrest Babcock <36795216+neisw@users.noreply.github.com> Date: Wed, 31 May 2023 08:32:17 -0400 Subject: [PATCH] Revert "test/extended/prometheus: fix test with enabled telemetry" --- 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 381018bba734..42e2071dbedd 100644 --- a/test/extended/prometheus/prometheus.go +++ b/test/extended/prometheus/prometheus.go @@ -195,10 +195,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 enabledErr, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { + if enabled, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { e2e.Failf("could not determine if Telemetry is enabled: %v", err) - } else if enabledErr != nil { - e2eskipper.Skipf("Telemetry is disabled: %v", enabledErr) + } else { + e2eskipper.Skipf("Telemetry is disabled: %v", enabled) } // we only consider series sent since the beginning of the test @@ -260,10 +260,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 enabledErr, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { + if enabled, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { e2e.Failf("could not determine if Telemetry is enabled: %v", err) - } else if enabledErr != nil { - e2eskipper.Skipf("Telemetry is disabled: %v", enabledErr) + } else { + e2eskipper.Skipf("Telemetry is disabled: %v", enabled) } tests := map[string]bool{}