github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31235 from ping035627/ping035627-patch-0823-1

Browse Source 
Automatic merge from submit-queue

Implement replace with a call to testapi.Codec()

Implement replace with a call to testapi.Codec().
This commit is contained in:
Kubernetes Submit Queue 2016-09-26 18:02:49 -07:00 committed by GitHub
commit 35e9f4d07f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/apply_test.go
View File

@ -25,13 +25,13 @@ import (
"os" "os"
"testing" "testing"
"github.com/ghodss/yaml"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/annotations"
kubeerr "k8s.io/kubernetes/pkg/api/errors" kubeerr "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/unversioned/fake" "k8s.io/kubernetes/pkg/client/unversioned/fake"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@ -79,8 +79,7 @@ func readBytesFromFile(t *testing.T, filename string) []byte {
func readReplicationControllerFromFile(t *testing.T, filename string) *api.ReplicationController { func readReplicationControllerFromFile(t *testing.T, filename string) *api.ReplicationController {
data := readBytesFromFile(t, filename) data := readBytesFromFile(t, filename)
rc := api.ReplicationController{} rc := api.ReplicationController{}
// TODO(jackgr): Replace with a call to testapi.Codec().Decode(). if err := runtime.DecodeInto(testapi.Default.Codec(), data, &rc); err != nil {
if err := yaml.Unmarshal(data, &rc); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -90,8 +89,7 @@ func readReplicationControllerFromFile(t *testing.T, filename string) *api.Repli
func readServiceFromFile(t *testing.T, filename string) *api.Service { func readServiceFromFile(t *testing.T, filename string) *api.Service {
data := readBytesFromFile(t, filename) data := readBytesFromFile(t, filename)
svc := api.Service{} svc := api.Service{}
// TODO(jackgr): Replace with a call to testapi.Codec().Decode(). if err := runtime.DecodeInto(testapi.Default.Codec(), data, &svc); err != nil {
if err := yaml.Unmarshal(data, &svc); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -107,7 +105,7 @@ func annotateRuntimeObject(t *testing.T, originalObj, currentObj runtime.Object,
originalLabels := originalAccessor.GetLabels() originalLabels := originalAccessor.GetLabels()
originalLabels["DELETE_ME"] = "DELETE_ME" originalLabels["DELETE_ME"] = "DELETE_ME"
originalAccessor.SetLabels(originalLabels) originalAccessor.SetLabels(originalLabels)
original, err := json.Marshal(originalObj) original, err := runtime.Encode(testapi.Default.Codec(), originalObj)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -123,7 +121,7 @@ func annotateRuntimeObject(t *testing.T, originalObj, currentObj runtime.Object,
} }
currentAnnotations[annotations.LastAppliedConfigAnnotation] = string(original) currentAnnotations[annotations.LastAppliedConfigAnnotation] = string(original)
currentAccessor.SetAnnotations(currentAnnotations) currentAccessor.SetAnnotations(currentAnnotations)
current, err := json.Marshal(currentObj) current, err := runtime.Encode(testapi.Default.Codec(), currentObj)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }