github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests to support ObjectMeta omitempty semantics

pull/8/head
Nikhita Raghunath 2018-08-19 01:04:28 +05:30
parent f69544e87d
commit dabd56f7df
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/1.request vendored
View File

@ -8,7 +8,6 @@
}, },
"name": "svc1", "name": "svc1",
"namespace": "edit-test", "namespace": "edit-test",
"resourceVersion": "",
"selfLink": "/api/v1/namespaces/edit-test/services/svc1", "selfLink": "/api/v1/namespaces/edit-test/services/svc1",
"uid": "4149f70e-e9dc-11e6-8c3b-acbc32c1ca87" "uid": "4149f70e-e9dc-11e6-8c3b-acbc32c1ca87"
}, },

1
pkg/kubectl/cmd/testdata/edit/testcase-create-list-error/3.request vendored
View File

@ -8,7 +8,6 @@
}, },
"name": "svc2", "name": "svc2",
"namespace": "edit-test", "namespace": "edit-test",
"resourceVersion": "",
"selfLink": "/api/v1/namespaces/edit-test/services/svc2", "selfLink": "/api/v1/namespaces/edit-test/services/svc2",
"uid": "3e9b10db-e9dc-11e6-8c3b-acbc32c1ca87" "uid": "3e9b10db-e9dc-11e6-8c3b-acbc32c1ca87"
}, },

3
pkg/kubectl/cmd/testdata/edit/testcase-unknown-field-known-group-kind/2.request vendored
View File

@ -2,8 +2,7 @@
"metadata": { "metadata": {
"labels": { "labels": {
"label2": "value2" "label2": "value2"
}, }
"namespace": ""
}, },
"unknownClientField": { "unknownClientField": {
"clientdata": true "clientdata": true

3
pkg/kubectl/cmd/testdata/edit/testcase-unknown-version-known-group-kind/2.request vendored
View File

@ -5,7 +5,6 @@
"metadata": { "metadata": {
"labels": { "labels": {
"label2": "value2" "label2": "value2"
}, }
"namespace": ""
} }
} }

4
staging/src/k8s.io/apiserver/pkg/registry/generic/registry/dryrun_test.go
View File

@ -215,7 +215,7 @@ func TestDryRunUpdateReturnsObject(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Failed to dry-run update: %v", err) t.Fatalf("Failed to dry-run update: %v", err)
} }
out = UnstructuredOrDie(`{"field": "value", "kind": "Pod", "metadata": {"resourceVersion": "2", "selfLink": ""}}`) out = UnstructuredOrDie(`{"field": "value", "kind": "Pod", "metadata": {"resourceVersion": "2"}}`)
if !reflect.DeepEqual(obj, out) { if !reflect.DeepEqual(obj, out) {
t.Fatalf("Returned object %#v different from expected %#v", obj, out) t.Fatalf("Returned object %#v different from expected %#v", obj, out)
} }
@ -268,7 +268,7 @@ func TestDryRunDeleteReturnsObject(t *testing.T) {
} }
out = UnstructuredOrDie(`{}`) out = UnstructuredOrDie(`{}`)
expected := UnstructuredOrDie(`{"kind": "Pod", "metadata": {"resourceVersion": "2", "selfLink": ""}}`) expected := UnstructuredOrDie(`{"kind": "Pod", "metadata": {"resourceVersion": "2"}}`)
err = s.Delete(context.Background(), "key", out, nil, true) err = s.Delete(context.Background(), "key", out, nil, true)
if err != nil { if err != nil {
t.Fatalf("Failed to delete with valid precondition: %v", err) t.Fatalf("Failed to delete with valid precondition: %v", err)