From c3cf47a6a68c355e0a491cb692c3f6503ccaf60f Mon Sep 17 00:00:00 2001 From: zhu733756 Date: Mon, 12 Apr 2021 15:40:41 +0800 Subject: [PATCH] fix bug that edge metrcis test run failed Signed-off-by: zhu733756 --- .../metricsserver/metricsserver_test.go | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go b/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go index 1d7d44160..543d1695e 100644 --- a/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go +++ b/pkg/simple/client/monitoring/metricsserver/metricsserver_test.go @@ -343,7 +343,7 @@ func TestGetNamedMetrics(t *testing.T) { PodName: tt.podName, NamespaceName: tt.namespaceName, }) - if diff := cmp.Diff(result, expected); diff != "" { + if diff := cmp.Diff(sortedResults(result), expected); diff != "" { t.Fatalf("%T differ (-got, +want): %s", expected, diff) } }) @@ -506,7 +506,7 @@ func TestGetNamedMetricsOverTime(t *testing.T) { PodName: tt.podName, NamespaceName: tt.namespaceName, }) - if diff := cmp.Diff(result, expected); diff != "" { + if diff := cmp.Diff(sortedResults(result), expected); diff != "" { t.Fatalf("%T differ (-got, +want): %s", expected, diff) } }) @@ -525,3 +525,22 @@ func jsonFromFile(expectedFile string, expectedJsonPtr interface{}) error { return nil } + +func sortedResults(result []monitoring.Metric) []monitoring.Metric { + + for _, mr := range result { + metricValues := mr.MetricData.MetricValues + length := len(metricValues) + for i, mv := range metricValues { + podName, _ := mv.Metadata["pod"] + if i == 0 && podName == "pod2" && length >= 2 { + metricValues[0], metricValues[1] = metricValues[1], metricValues[0] + } + break + + } + } + + return result + +}