Merge pull request #16294 from aveshagarwal/master-fix-code-duplication

Fixes code duplication.
This commit is contained in:
Jerzy Szczepkowski 2015-10-28 13:23:06 +01:00
commit 1524d7490a

View File

@ -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)