admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug that edge metrcis test run failed

Browse Source 
Signed-off-by: zhu733756 <talonzhu@yunify.com>
This commit is contained in:
zhu733756
2021-04-12 15:40:41 +08:00
parent 0f55e466ab
commit c3cf47a6a6
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/simple/client/monitoring/metricsserver/metricsserver_test.go
View File

@@ -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
}