published by bot

(https://github.com/kubernetes/test-infra/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is ab794c612853e6c6dfda63594cb5d74914e7e151
This commit is contained in:
Kubernetes Publisher
2017-02-03 22:09:57 +00:00
parent 1679e38db8
commit 7ac1236194
66 changed files with 230 additions and 4317 deletions

View File

@@ -29,6 +29,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8sruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/pkg/api"
_ "k8s.io/client-go/pkg/api/install" // To register api.Pod used in tests below
"k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest"
@@ -118,8 +119,8 @@ func TestEventf(t *testing.T) {
UID: "differentUid",
},
}
testRef, err := v1.GetPartialReference(testPod, "spec.containers[2]")
testRef2, err := v1.GetPartialReference(testPod2, "spec.containers[3]")
testRef, err := v1.GetPartialReference(api.Scheme, testPod, "spec.containers[2]")
testRef2, err := v1.GetPartialReference(api.Scheme, testPod2, "spec.containers[3]")
if err != nil {
t.Fatal(err)
}
@@ -374,7 +375,7 @@ func TestEventf(t *testing.T) {
}
func recorderWithFakeClock(eventSource v1.EventSource, eventBroadcaster EventBroadcaster, clock clock.Clock) EventRecorder {
return &recorderImpl{eventSource, eventBroadcaster.(*eventBroadcasterImpl).Broadcaster, clock}
return &recorderImpl{api.Scheme, eventSource, eventBroadcaster.(*eventBroadcasterImpl).Broadcaster, clock}
}
func TestWriteEventError(t *testing.T) {
@@ -495,7 +496,7 @@ func TestLotsOfEvents(t *testing.T) {
logWatcher := eventBroadcaster.StartLogging(func(formatter string, args ...interface{}) {
loggerCalled <- struct{}{}
})
recorder := eventBroadcaster.NewRecorder(v1.EventSource{Component: "eventTest"})
recorder := eventBroadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: "eventTest"})
ref := &v1.ObjectReference{
Kind: "Pod",
Name: "foo",
@@ -530,7 +531,7 @@ func TestEventfNoNamespace(t *testing.T) {
UID: "bar",
},
}
testRef, err := v1.GetPartialReference(testPod, "spec.containers[2]")
testRef, err := v1.GetPartialReference(api.Scheme, testPod, "spec.containers[2]")
if err != nil {
t.Fatal(err)
}
@@ -636,8 +637,8 @@ func TestMultiSinkCache(t *testing.T) {
UID: "differentUid",
},
}
testRef, err := v1.GetPartialReference(testPod, "spec.containers[2]")
testRef2, err := v1.GetPartialReference(testPod2, "spec.containers[3]")
testRef, err := v1.GetPartialReference(api.Scheme, testPod, "spec.containers[2]")
testRef2, err := v1.GetPartialReference(api.Scheme, testPod2, "spec.containers[3]")
if err != nil {
t.Fatal(err)
}