From 42c7e62180446910f41d3a064016c0d7cdebb407 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 13 Aug 2021 11:54:21 -0700 Subject: [PATCH] Fix registry tests to look at result objects --- .../apiserver/pkg/registry/rest/resttest/resttest.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go index b394da620fa..c271c66edf6 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go @@ -381,7 +381,8 @@ func (t *Tester) testCreateGeneratesName(valid runtime.Object) { t.Fatalf("Unexpected error: %v", err) } defer t.delete(t.TestContext(), created) - if objectMeta.GetName() == "test-" || !strings.HasPrefix(objectMeta.GetName(), "test-") { + createdMeta := t.getObjectMetaOrFail(created) + if createdMeta.GetName() == "test-" || !strings.HasPrefix(createdMeta.GetName(), "test-") { t.Errorf("unexpected name: %#v", valid) } } @@ -399,7 +400,8 @@ func (t *Tester) testCreateHasMetadata(valid runtime.Object) { t.Fatalf("Unexpected object from result: %#v", obj) } defer t.delete(t.TestContext(), obj) - if !metav1.HasObjectMetaSystemFieldValues(objectMeta) { + createdMeta := t.getObjectMetaOrFail(obj) + if !metav1.HasObjectMetaSystemFieldValues(createdMeta) { t.Errorf("storage did not populate object meta field values") } } @@ -501,7 +503,8 @@ func (t *Tester) testCreateResetsUserData(valid runtime.Object, opts metav1.Crea t.Fatalf("Unexpected object from result: %#v", obj) } defer t.delete(t.TestContext(), obj) - if objectMeta.GetUID() == "bad-uid" || objectMeta.GetCreationTimestamp() == now { + createdMeta := t.getObjectMetaOrFail(obj) + if createdMeta.GetUID() == "bad-uid" || createdMeta.GetCreationTimestamp() == now { t.Errorf("ObjectMeta did not reset basic fields: %#v", objectMeta) } }