From 44e7380fb76d50876a0e6b265090d30aacaabf5a Mon Sep 17 00:00:00 2001 From: Neo2308 Date: Thu, 7 Sep 2023 13:32:41 +0530 Subject: [PATCH] Fixing flaky test Signed-off-by: Neo2308 --- .../handler/logging_enqueue_object_test.go | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/internal/ansible/handler/logging_enqueue_object_test.go b/internal/ansible/handler/logging_enqueue_object_test.go index dd92634b1ec..1544b9d7d6c 100644 --- a/internal/ansible/handler/logging_enqueue_object_test.go +++ b/internal/ansible/handler/logging_enqueue_object_test.go @@ -77,8 +77,9 @@ var _ = Describe("LoggingEnqueueRequestForObject", func() { })) // verify metrics - gauges, err := metrics.Registry.Gather() + rawGauges, err := metrics.Registry.Gather() Expect(err).NotTo(HaveOccurred()) + gauges := filterGauges(rawGauges) Expect(gauges).To(HaveLen(1)) assertMetrics(gauges[0], 1, []*corev1.Pod{pod}) }) @@ -120,8 +121,9 @@ var _ = Describe("LoggingEnqueueRequestForObject", func() { })) // verify metrics - gauges, err := metrics.Registry.Gather() + rawGauges, err := metrics.Registry.Gather() Expect(err).NotTo(HaveOccurred()) + gauges := filterGauges(rawGauges) Expect(gauges).To(BeEmpty()) }) }) @@ -149,8 +151,9 @@ var _ = Describe("LoggingEnqueueRequestForObject", func() { })) // verify metrics - gauges, err := metrics.Registry.Gather() + rawGauges, err := metrics.Registry.Gather() Expect(err).NotTo(HaveOccurred()) + gauges := filterGauges(rawGauges) Expect(gauges).To(BeEmpty()) }) }) @@ -188,8 +191,9 @@ var _ = Describe("LoggingEnqueueRequestForObject", func() { })) // verify metrics - gauges, err := metrics.Registry.Gather() + rawGauges, err := metrics.Registry.Gather() Expect(err).NotTo(HaveOccurred()) + gauges := filterGauges(rawGauges) Expect(gauges).To(HaveLen(1)) assertMetrics(gauges[0], 2, []*corev1.Pod{newpod, pod}) }) @@ -219,3 +223,13 @@ func assertMetrics(gauge *dto.MetricFamily, count int, pods []*corev1.Pod) { } } } + +func filterGauges(gauges []*dto.MetricFamily) []*dto.MetricFamily { + var filteredGauges []*dto.MetricFamily + for _, gauge := range gauges { + if *gauge.Name != "rest_client_requests_total" { + filteredGauges = append(filteredGauges, gauge) + } + } + return filteredGauges +}