github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

update unit tests to handle APIs that were removed

Browse Source
This commit is contained in:
David Eads 2021-03-25 13:10:07 -04:00
parent f594c25c70
commit 567418f377
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/controlplane/instance_test.go
View File

@ -317,31 +317,13 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) {
assert.NoError(decodeResponse(resp, &groupList)) assert.NoError(decodeResponse(resp, &groupList))
assert.Equal(groupList.APIVersion, "") assert.Equal(groupList.APIVersion, "")
// /apis/extensions exists in release-1.1
resp, err = http.Get(server.URL + "/apis/extensions")
if err != nil {
t.Errorf("unexpected error: %v", err)
}
group := metav1.APIGroup{}
assert.NoError(decodeResponse(resp, &group))
assert.Equal(group.APIVersion, "")
// /apis/extensions/v1beta1 exists in release-1.1
resp, err = http.Get(server.URL + "/apis/extensions/v1beta1")
if err != nil {
t.Errorf("unexpected error: %v", err)
}
resourceList = metav1.APIResourceList{}
assert.NoError(decodeResponse(resp, &resourceList))
assert.Equal(resourceList.APIVersion, "")
// /apis/autoscaling doesn't exist in release-1.1, so the APIVersion field // /apis/autoscaling doesn't exist in release-1.1, so the APIVersion field
// should be non-empty in the results returned by the server. // should be non-empty in the results returned by the server.
resp, err = http.Get(server.URL + "/apis/autoscaling") resp, err = http.Get(server.URL + "/apis/autoscaling")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
group = metav1.APIGroup{} group := metav1.APIGroup{}
assert.NoError(decodeResponse(resp, &group)) assert.NoError(decodeResponse(resp, &group))
assert.Equal(group.APIVersion, "v1") assert.Equal(group.APIVersion, "v1")
@ -376,8 +358,10 @@ func TestStorageVersionHashes(t *testing.T) {
t.Error(err) t.Error(err)
} }
var count int var count int
apiResources := sets.NewString()
for _, g := range all { for _, g := range all {
for _, r := range g.APIResources { for _, r := range g.APIResources {
apiResources.Insert(g.GroupVersion + "/" + r.Name)
if strings.Contains(r.Name, "/") || if strings.Contains(r.Name, "/") ||
storageversionhashdata.NoStorageVersionHash.Has(g.GroupVersion+"/"+r.Name) { storageversionhashdata.NoStorageVersionHash.Has(g.GroupVersion+"/"+r.Name) {
if r.StorageVersionHash != "" { if r.StorageVersionHash != "" {
@ -399,7 +383,8 @@ func TestStorageVersionHashes(t *testing.T) {
} }
} }
if count != len(storageversionhashdata.GVRToStorageVersionHash) { if count != len(storageversionhashdata.GVRToStorageVersionHash) {
t.Errorf("please remove the redundant entries from GVRToStorageVersionHash") knownResources := sets.StringKeySet(storageversionhashdata.GVRToStorageVersionHash)
t.Errorf("please remove the redundant entries from GVRToStorageVersionHash: %v", knownResources.Difference(apiResources).List())
} }
} }