kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix includeObject parameter parsing 

Kubernetes-commit: a7a551148071bb4d87f73c7b6c0f4bd7cc829b22
This commit is contained in:
Jordan Liggitt 2017-08-04 13:25:23 -04:00 committed by Kubernetes Publisher
parent 787b46c230
commit f5f8465637
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/endpoints/apiserver_test.go
View File

@ -1885,6 +1885,20 @@ func TestGetTable(t *testing.T) {
}, },
}, },
}, },
{
accept: runtime.ContentTypeJSON + ";as=Table;v=v1alpha1;g=meta.k8s.io",
params: url.Values{"includeObject": []string{"Metadata"}},
expected: &metav1alpha1.Table{
TypeMeta: metav1.TypeMeta{Kind: "Table", APIVersion: "meta.k8s.io/v1alpha1"},
ColumnDefinitions: []metav1alpha1.TableColumnDefinition{
{Name: "Name", Type: "string", Description: metaDoc["name"]},
{Name: "Created At", Type: "date", Description: metaDoc["creationTimestamp"]},
},
Rows: []metav1alpha1.TableRow{
{Cells: []interface{}{"foo1", now.Time.UTC().Format(time.RFC3339)}, Object: runtime.RawExtension{Raw: encodedBody}},
},
},
},
} }
for i, test := range tests { for i, test := range tests {
u, err := url.Parse(server.URL + "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/namespaces/default/simple/id") u, err := url.Parse(server.URL + "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version + "/namespaces/default/simple/id")
@ -1901,18 +1915,20 @@ func TestGetTable(t *testing.T) {
} }
if test.statusCode != 0 { if test.statusCode != 0 {
if resp.StatusCode != test.statusCode { if resp.StatusCode != test.statusCode {
t.Errorf("%d: unexpected response: %#v", resp) t.Errorf("%d: unexpected response: %#v", i, resp)
} }
continue continue
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
t.Errorf("%d: unexpected response: %#v", resp) t.Errorf("%d: unexpected response: %#v", i, resp)
} }
var itemOut metav1alpha1.Table var itemOut metav1alpha1.Table
if _, err = extractBody(resp, &itemOut); err != nil { body, err := extractBody(resp, &itemOut)
if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !reflect.DeepEqual(test.expected, &itemOut) { if !reflect.DeepEqual(test.expected, &itemOut) {
t.Log(body)
t.Errorf("%d: did not match: %s", i, diff.ObjectReflectDiff(test.expected, &itemOut)) t.Errorf("%d: did not match: %s", i, diff.ObjectReflectDiff(test.expected, &itemOut))
} }
} }