Skip to content

Commit

Permalink
Fix test now that empty struct are tracked in mangaed fields
Browse files Browse the repository at this point in the history
  • Loading branch information
apelisse authored and kevindelgado committed Apr 2, 2021
1 parent 593cd4d commit b8f7e21
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions test/integration/apiserver/apply/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ var statusData = map[schema.GroupVersionResource]string{

const statusDefault = `{"status": {"conditions": [{"type": "MyStatus", "status":"True"}]}}`

// Some status-only APIs have empty object on creation. Therefore we don't expect create_test
// managedFields for these APIs
var ignoreCreateManagementList = map[schema.GroupVersionResource]struct{}{
gvr("internal.apiserver.k8s.io", "v1alpha1", "storageversions"): {},
}

func gvr(g, v, r string) schema.GroupVersionResource {
return schema.GroupVersionResource{Group: g, Version: v, Resource: r}
}
Expand Down Expand Up @@ -205,11 +199,7 @@ func TestApplyStatus(t *testing.T) {
t.Fatalf("Couldn't find apply_status_test: %v", managedFields)
}
if !findManager(managedFields, "create_test") {
if _, ok := ignoreCreateManagementList[mapping.Resource]; !ok {
t.Fatalf("Couldn't find create_test: %v", managedFields)
}
} else if _, ok := ignoreCreateManagementList[mapping.Resource]; ok {
t.Fatalf("found create_test in ignoreCreateManagementList resource: %v", managedFields)
t.Fatalf("Couldn't find create_test: %v", managedFields)
}

if err := rsc.Delete(context.TODO(), name, *metav1.NewDeleteOptions(0)); err != nil {
Expand Down

0 comments on commit b8f7e21

Please sign in to comment.