From ca6e794c60d267a2ffcd277c6212c94c73ad258e Mon Sep 17 00:00:00 2001 From: wojtekt Date: Tue, 12 Nov 2019 14:19:14 +0100 Subject: [PATCH] Eliminate couple unnecessary conversions Kubernetes-commit: 067d173266303c5c9a4281e962d3662c34a78053 --- pkg/endpoints/apiserver_test.go | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go index 5c5af50ac..80c70f50b 100644 --- a/pkg/endpoints/apiserver_test.go +++ b/pkg/endpoints/apiserver_test.go @@ -2675,16 +2675,25 @@ func TestGetWithOptions(t *testing.T) { t.Errorf("%s: unexpected response: %#v", test.name, resp) continue } - var itemOut genericapitesting.Simple - body, err := extractBody(resp, &itemOut) + + var itemOut runtime.Object + if test.rootScoped { + itemOut = &genericapitesting.SimpleRoot{} + } else { + itemOut = &genericapitesting.Simple{} + } + body, err := extractBody(resp, itemOut) if err != nil { t.Errorf("%s: %v", test.name, err) continue } - - if itemOut.Name != simpleStorage.item.Name { - t.Errorf("%s: Unexpected data: %#v, expected %#v (%s)", test.name, itemOut, simpleStorage.item, string(body)) - continue + if metadata, err := meta.Accessor(itemOut); err == nil { + if metadata.GetName() != simpleStorage.item.Name { + t.Errorf("%s: Unexpected data: %#v, expected %#v (%s)", test.name, itemOut, simpleStorage.item, string(body)) + continue + } + } else { + t.Errorf("%s: Couldn't get name from %#v: %v", test.name, itemOut, err) } var opts *genericapitesting.SimpleGetOptions