Commit d8223ff9 authored by Tim Hockin's avatar Tim Hockin

Merge pull request #5804 from smarterclayton/fixing_broken_tests

Syntax errors in file_test were added right as validation became more strict
parents e8f70428 b442f769
...@@ -165,9 +165,9 @@ func TestReadFromFile(t *testing.T) { ...@@ -165,9 +165,9 @@ func TestReadFromFile(t *testing.T) {
"namespace": "mynamespace", "namespace": "mynamespace",
"desiredState": { "desiredState": {
"manifest": { "manifest": {
"containers": [{ "name": "image", "image": "test/image" }], "containers": [{ "name": "image", "image": "test/image" }]
}, }
}, }
}`, }`,
expected: CreatePodUpdate(kubelet.SET, kubelet.FileSource, api.Pod{ expected: CreatePodUpdate(kubelet.SET, kubelet.FileSource, api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
...@@ -195,9 +195,9 @@ func TestReadFromFile(t *testing.T) { ...@@ -195,9 +195,9 @@ func TestReadFromFile(t *testing.T) {
"uid": "12345", "uid": "12345",
"desiredState": { "desiredState": {
"manifest": { "manifest": {
"containers": [{ "name": "image", "image": "test/image" }], "containers": [{ "name": "image", "image": "test/image" }]
}, }
}, }
}`, }`,
expected: CreatePodUpdate(kubelet.SET, kubelet.FileSource, api.Pod{ expected: CreatePodUpdate(kubelet.SET, kubelet.FileSource, api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
...@@ -224,11 +224,11 @@ func TestReadFromFile(t *testing.T) { ...@@ -224,11 +224,11 @@ func TestReadFromFile(t *testing.T) {
"apiversion": "v1beta3", "apiversion": "v1beta3",
"metadata": { "metadata": {
"uid": "12345", "uid": "12345",
"name": "test", "name": "test"
}, },
"spec": { "spec": {
"containers": [{ "name": "image", "image": "test/image" }], "containers": [{ "name": "image", "image": "test/image" }]
}, }
}`, }`,
expected: CreatePodUpdate(kubelet.SET, kubelet.FileSource, api.Pod{ expected: CreatePodUpdate(kubelet.SET, kubelet.FileSource, api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment