github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

ut: fix TestLegacyFallbackNoCache versions order

Browse Source
This commit is contained in:
Paco Xu 2023-02-23 12:04:18 +08:00
parent b86f94f438
commit b8ef5be44f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery_test.go
View File

@ -20,6 +20,7 @@ import (
"context"
"net/http"
"net/http/httptest"
"sort"
"strconv"
"strings"
"testing"
@ -370,15 +371,28 @@ func TestLegacyFallbackNoCache(t *testing.T) {
Freshness: apidiscoveryv2beta1.DiscoveryFreshnessCurrent,
})
}
sort.Sort(byVersion(aggregatedVersions))
aggregatedDiscovery := []apidiscoveryv2beta1.APIGroupDiscovery{{
ObjectMeta: metav1.ObjectMeta{
Name: resources["v1"].Group,
},
Versions: aggregatedVersions,
}}
require.Equal(t, aggregatedDiscovery, doc.Items)
require.Equal(t, doc.Items, aggregatedDiscovery)
}
type byVersion []apidiscoveryv2beta1.APIVersionDiscovery
var versionMap = map[string]int{
"v1": 1,
"v1beta1": 2,
"v1alpha1": 3,
}
func (a byVersion) Len() int { return len(a) }
func (a byVersion) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func (a byVersion) Less(i, j int) bool { return versionMap[a[i].Version] < versionMap[a[j].Version] }
func TestLegacyFallback(t *testing.T) {
aggregatedResourceManager := discoveryendpoint.NewResourceManager()
rootAPIsHandler := discovery.NewRootAPIsHandler(discovery.DefaultAddresses{DefaultAddress: "192.168.1.1"}, scheme.Codecs)