From 0d9689a55d30858aab7807f9a50bdc578337c81c Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Fri, 17 Jun 2022 12:54:16 +0200 Subject: [PATCH] fix a bug on endpointslices tests comparing the wrong metrics --- pkg/controller/endpointslice/reconciler_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/controller/endpointslice/reconciler_test.go b/pkg/controller/endpointslice/reconciler_test.go index 6c31a2145d1..5aadc5f3090 100644 --- a/pkg/controller/endpointslice/reconciler_test.go +++ b/pkg/controller/endpointslice/reconciler_test.go @@ -1594,7 +1594,7 @@ func TestReconcileTopology(t *testing.T) { expectedCrossZoneHints: 1, expectedMetrics: expectedMetrics{ desiredSlices: 1, - actualSlices: 1, + actualSlices: 2, desiredEndpoints: 9, addedPerSync: 0, removedPerSync: 0, @@ -1617,7 +1617,7 @@ func TestReconcileTopology(t *testing.T) { expectedCrossZoneHints: 0, expectedMetrics: expectedMetrics{ desiredSlices: 1, - actualSlices: 1, + actualSlices: 2, desiredEndpoints: 9, addedPerSync: 0, removedPerSync: 0, @@ -1650,6 +1650,9 @@ func TestReconcileTopology(t *testing.T) { cmc.Check(t) expectMetrics(t, tc.expectedMetrics) fetchedSlices := fetchEndpointSlices(t, client, ns) + if len(fetchedSlices) != tc.expectedMetrics.actualSlices { + t.Fatalf("Actual slices %d doesn't match metric %d", len(fetchedSlices), tc.expectedMetrics.actualSlices) + } if tc.expectedHints == nil { for _, slice := range fetchedSlices { @@ -1864,7 +1867,7 @@ func expectMetrics(t *testing.T, em expectedMetrics) { actualNumSlices, err := testutil.GetGaugeMetricValue(metrics.NumEndpointSlices.WithLabelValues()) handleErr(t, err, "numEndpointSlices") - if actualDesiredSlices != float64(em.desiredSlices) { + if actualNumSlices != float64(em.actualSlices) { t.Errorf("Expected numEndpointSlices to be %d, got %v", em.actualSlices, actualNumSlices) }