Move ObjectDiff into util

This commit is contained in:
Clayton Coleman
2014-10-09 17:23:43 -04:00
parent 996c0e44d6
commit 935e97d59d
5 changed files with 71 additions and 52 deletions

View File

@@ -25,7 +25,6 @@ import (
internal "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta2"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/fsouza/go-dockerclient"
"github.com/google/gofuzz"
@@ -128,7 +127,7 @@ func TestInternalRoundTrip(t *testing.T) {
}
if !reflect.DeepEqual(obj, actual) {
t.Errorf("%s: diff %s", k, runtime.ObjectDiff(obj, actual))
t.Errorf("%s: diff %s", k, util.ObjectDiff(obj, actual))
}
}
}

View File

@@ -130,7 +130,7 @@ func runTest(t *testing.T, codec runtime.Codec, source runtime.Object) {
return
} else {
if !reflect.DeepEqual(source, obj2) {
t.Errorf("1: %v: diff: %v", name, runtime.ObjectDiff(source, obj2))
t.Errorf("1: %v: diff: %v", name, util.ObjectDiff(source, obj2))
return
}
}
@@ -141,7 +141,7 @@ func runTest(t *testing.T, codec runtime.Codec, source runtime.Object) {
return
} else {
if !reflect.DeepEqual(source, obj3) {
t.Errorf("3: %v: diff: %v", name, runtime.ObjectDiff(source, obj3))
t.Errorf("3: %v: diff: %v", name, util.ObjectDiff(source, obj3))
return
}
}