Move first metric check to BeforeEach()

Signed-off-by: Josef Karasek <jkarasek@redhat.com>
operator-framework · Jul 12, 2021 · fc58998 · fc58998
1 parent d881085
commit fc58998
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/test/e2e/metrics_e2e_test.go b/test/e2e/metrics_e2e_test.go
@@ -130,19 +130,18 @@ var _ = Describe("Metrics are generated for OLM managed resources", func() {
 
 				_, err = fetchCSV(crc, csv.Name, testNamespace, csvSucceededChecker)
 				Expect(err).ToNot(HaveOccurred())
+
+				Expect(getMetricsFromPod(c, getPodWithLabel(c, "app=olm-operator"), "8081")).To(
+					ContainElement(LikeMetric(WithFamily("csv_succeeded"), WithName(csv.Name), WithValue(1))),
+				)
 			})
 			AfterEach(func() {
 				if cleanupCSV != nil {
 					cleanupCSV()
 				}
 			})
 			It("csv metric is preserved", func() {
-				Expect(getMetricsFromPod(c, getPodWithLabel(c, "app=olm-operator"), "8081")).To(
-					ContainElement(LikeMetric(WithFamily("csv_succeeded"), WithName(csv.Name), WithValue(1))),
-				)
-
 				restartDeploymentWithLabel(c, "app=olm-operator")
-
 				Expect(getMetricsFromPod(c, getPodWithLabel(c, "app=olm-operator"), "8081")).To(
 					ContainElement(LikeMetric(WithFamily("csv_succeeded"), WithName(csv.Name), WithValue(1))),
 				)