Skip to content

Commit 6b9d097

Browse files
Fix e2e test to validate that metrics are exported without asserting a controller-specific metric
1 parent 36e1538 commit 6b9d097

File tree

7 files changed

+14
-21
lines changed

7 files changed

+14
-21
lines changed

docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,8 @@ var _ = Describe("Manager", Ordered, func() {
260260

261261
By("getting the metrics by checking curl-metrics logs")
262262
metricsOutput := getMetricsOutput()
263-
Expect(metricsOutput).To(ContainSubstring(
264-
"controller_runtime_reconcile_total",
265-
))
263+
Expect(metricsOutput).NotTo(BeEmpty())
264+
Expect(metricsOutput).To(ContainSubstring("# TYPE"))
266265
})
267266

268267
It("should provisioned cert-manager", func() {

docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,8 @@ var _ = Describe("Manager", Ordered, func() {
255255

256256
By("getting the metrics by checking curl-metrics logs")
257257
metricsOutput := getMetricsOutput()
258-
Expect(metricsOutput).To(ContainSubstring(
259-
"controller_runtime_reconcile_total",
260-
))
258+
Expect(metricsOutput).NotTo(BeEmpty())
259+
Expect(metricsOutput).To(ContainSubstring("# TYPE"))
261260
})
262261

263262
// +kubebuilder:scaffold:e2e-webhooks-checks

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,8 @@ var _ = Describe("Manager", Ordered, func() {
260260

261261
By("getting the metrics by checking curl-metrics logs")
262262
metricsOutput := getMetricsOutput()
263-
Expect(metricsOutput).To(ContainSubstring(
264-
"controller_runtime_reconcile_total",
265-
))
263+
Expect(metricsOutput).NotTo(BeEmpty())
264+
Expect(metricsOutput).To(ContainSubstring("# TYPE"))
266265
})
267266

268267
It("should provisioned cert-manager", func() {

pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,8 @@ var _ = Describe("Manager", Ordered, func() {
438438
439439
By("getting the metrics by checking curl-metrics logs")
440440
metricsOutput := getMetricsOutput()
441-
Expect(metricsOutput).To(ContainSubstring(
442-
"controller_runtime_reconcile_total",
443-
))
441+
Expect(metricsOutput).NotTo(BeEmpty())
442+
Expect(metricsOutput).To(ContainSubstring("# TYPE",))
444443
})
445444
446445
// +kubebuilder:scaffold:e2e-webhooks-checks

testdata/project-v4-multigroup/test/e2e/e2e_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,8 @@ var _ = Describe("Manager", Ordered, func() {
255255

256256
By("getting the metrics by checking curl-metrics logs")
257257
metricsOutput := getMetricsOutput()
258-
Expect(metricsOutput).To(ContainSubstring(
259-
"controller_runtime_reconcile_total",
260-
))
258+
Expect(metricsOutput).NotTo(BeEmpty())
259+
Expect(metricsOutput).To(ContainSubstring("# TYPE"))
261260
})
262261

263262
It("should provisioned cert-manager", func() {

testdata/project-v4-with-plugins/test/e2e/e2e_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,8 @@ var _ = Describe("Manager", Ordered, func() {
255255

256256
By("getting the metrics by checking curl-metrics logs")
257257
metricsOutput := getMetricsOutput()
258-
Expect(metricsOutput).To(ContainSubstring(
259-
"controller_runtime_reconcile_total",
260-
))
258+
Expect(metricsOutput).NotTo(BeEmpty())
259+
Expect(metricsOutput).To(ContainSubstring("# TYPE"))
261260
})
262261

263262
It("should provisioned cert-manager", func() {

testdata/project-v4/test/e2e/e2e_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,8 @@ var _ = Describe("Manager", Ordered, func() {
255255

256256
By("getting the metrics by checking curl-metrics logs")
257257
metricsOutput := getMetricsOutput()
258-
Expect(metricsOutput).To(ContainSubstring(
259-
"controller_runtime_reconcile_total",
260-
))
258+
Expect(metricsOutput).NotTo(BeEmpty())
259+
Expect(metricsOutput).To(ContainSubstring("# TYPE"))
261260
})
262261

263262
It("should provisioned cert-manager", func() {

0 commit comments

Comments
 (0)