github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-13 10:39:07 +00:00
Code Issues Projects Releases Wiki Activity

Refactor diff into sub pkg

Browse Source
This commit is contained in:
harry
2016-03-11 10:43:55 +08:00
committed by Harry Zhang
parent d6e1566509
commit b0900bf0d4
36 changed files with 92 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/runtime/serializer/codec_test.go
View File

@@ -28,7 +28,7 @@ import (
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/diff"
"github.com/ghodss/yaml"
"github.com/google/gofuzz"
@@ -187,12 +187,12 @@ func objDiff(a, b interface{}) string {
if err != nil {
panic("b")
}
return util.StringDiff(string(ab), string(bb))
return diff.StringDiff(string(ab), string(bb))
// An alternate diff attempt, in case json isn't showing you
// the difference. (reflect.DeepEqual makes a distinction between
// nil and empty slices, for example.)
//return util.StringDiff(
//return diff.StringDiff(
// fmt.Sprintf("%#v", a),
// fmt.Sprintf("%#v", b),
//)
@@ -222,7 +222,7 @@ func runTest(t *testing.T, source interface{}) {
return
}
if !semantic.DeepEqual(source, obj2) {
t.Errorf("1: %v: diff: %v", name, util.ObjectGoPrintSideBySide(source, obj2))
t.Errorf("1: %v: diff: %v", name, diff.ObjectGoPrintSideBySide(source, obj2))
return
}
obj3 := reflect.New(reflect.TypeOf(source).Elem()).Interface()