From e845dba9d25e815f53ffb1f01f833ce3ab3bc146 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Tue, 20 Oct 2015 17:34:14 -0400 Subject: [PATCH] Fixes code duplication. --- pkg/kubelet/oom_watcher_test.go | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/pkg/kubelet/oom_watcher_test.go b/pkg/kubelet/oom_watcher_test.go index fc18cd6da00..9876410dfdb 100644 --- a/pkg/kubelet/oom_watcher_test.go +++ b/pkg/kubelet/oom_watcher_test.go @@ -17,40 +17,15 @@ limitations under the License. package kubelet import ( - "fmt" "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" - "k8s.io/kubernetes/pkg/runtime" ) -type fakeEvent struct { - object runtime.Object - timestamp unversioned.Time - reason string - message string -} - -type fakeRecorder struct { - events []fakeEvent -} - -func (f fakeRecorder) Event(object runtime.Object, reason, message string) { - f.events = append(f.events, fakeEvent{object, unversioned.Now(), reason, message}) -} - -func (f fakeRecorder) Eventf(object runtime.Object, reason, messageFmt string, args ...interface{}) { - f.events = append(f.events, fakeEvent{object, unversioned.Now(), reason, fmt.Sprintf(messageFmt, args...)}) -} - -func (f fakeRecorder) PastEventf(object runtime.Object, timestamp unversioned.Time, reason, messageFmt string, args ...interface{}) { - f.events = append(f.events, fakeEvent{object, timestamp, reason, fmt.Sprintf(messageFmt, args...)}) -} - func TestBasic(t *testing.T) { - fakeRecorder := fakeRecorder{} + fakeRecorder := &record.FakeRecorder{} mockCadvisor := &cadvisor.Fake{} node := &api.ObjectReference{} oomWatcher := NewOOMWatcher(mockCadvisor, fakeRecorder)