scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

This commit fixes tests.

Browse Source
This commit is contained in:
Avesh Agarwal
2015-11-13 17:30:45 -05:00
parent a2299253cf
commit 001437a72f
8 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/mesos/pkg/scheduler/integration/integration_test.go
View File

@@ -313,6 +313,7 @@ func NewTestOffer(id string) *mesos.Offer {
// Add assertions to reason about event streams // Add assertions to reason about event streams
type Event struct { type Event struct {
Object runtime.Object Object runtime.Object
Type string
Reason string Reason string
Message string Message string
} }
@@ -334,15 +335,15 @@ func NewEventObserver() *EventObserver {
} }
} }
func (o *EventObserver) Event(object runtime.Object, reason, message string) { func (o *EventObserver) Event(object runtime.Object, eventtype, reason, message string) {
o.fifo <- Event{Object: object, Reason: reason, Message: message} o.fifo <- Event{Object: object, Type: eventtype, Reason: reason, Message: message}
} }
func (o *EventObserver) Eventf(object runtime.Object, reason, messageFmt string, args ...interface{}) { func (o *EventObserver) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) {
o.fifo <- Event{Object: object, Reason: reason, Message: fmt.Sprintf(messageFmt, args...)} o.fifo <- Event{Object: object, Type: eventtype, Reason: reason, Message: fmt.Sprintf(messageFmt, args...)}
} }
func (o *EventObserver) PastEventf(object runtime.Object, timestamp unversioned.Time, reason, messageFmt string, args ...interface{}) { func (o *EventObserver) PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) {
o.fifo <- Event{Object: object, Reason: reason, Message: fmt.Sprintf(messageFmt, args...)} o.fifo <- Event{Object: object, Type: eventtype, Reason: reason, Message: fmt.Sprintf(messageFmt, args...)}
} }
func (a *EventAssertions) Event(observer *EventObserver, pred EventPredicate, msgAndArgs ...interface{}) bool { func (a *EventAssertions) Event(observer *EventObserver, pred EventPredicate, msgAndArgs ...interface{}) bool {

77
pkg/client/record/event_test.go
View File

@@ -127,6 +127,7 @@ func TestEventf(t *testing.T) {
} }
table := []struct { table := []struct {
obj k8sruntime.Object obj k8sruntime.Object
eventtype string
reason string reason string
messageFmt string messageFmt string
elements []interface{} elements []interface{}
@@ -136,6 +137,7 @@ func TestEventf(t *testing.T) {
}{ }{
{ {
obj: testRef, obj: testRef,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -156,12 +158,14 @@ func TestEventf(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testPod, obj: testPod,
eventtype: api.EventTypeNormal,
reason: "Killed", reason: "Killed",
messageFmt: "some other verbose message: %v", messageFmt: "some other verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -181,12 +185,14 @@ func TestEventf(t *testing.T) {
Message: "some other verbose message: 1", Message: "some other verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:""}): reason: 'Killed' some other verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:""}): type: 'Normal' reason: 'Killed' some other verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testRef, obj: testRef,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -207,12 +213,14 @@ func TestEventf(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 2, Count: 2,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
{ {
obj: testRef2, obj: testRef2,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -233,12 +241,14 @@ func TestEventf(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testRef, obj: testRef,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -259,12 +269,14 @@ func TestEventf(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 3, Count: 3,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
{ {
obj: testRef2, obj: testRef2,
eventtype: api.EventTypeNormal,
reason: "Stopped", reason: "Stopped",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -285,12 +297,14 @@ func TestEventf(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Stopped' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): type: 'Normal' reason: 'Stopped' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testRef2, obj: testRef2,
eventtype: api.EventTypeNormal,
reason: "Stopped", reason: "Stopped",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -311,8 +325,9 @@ func TestEventf(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 2, Count: 2,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Stopped' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): type: 'Normal' reason: 'Stopped' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
} }
@@ -344,7 +359,7 @@ func TestEventf(t *testing.T) {
} }
logCalled <- struct{}{} logCalled <- struct{}{}
}) })
recorder.Eventf(item.obj, item.reason, item.messageFmt, item.elements...) recorder.Eventf(item.obj, item.eventtype, item.reason, item.messageFmt, item.elements...)
<-logCalled <-logCalled
@@ -434,10 +449,10 @@ func TestWriteEventError(t *testing.T) {
recorder := recorderWithFakeClock(api.EventSource{Component: "eventTest"}, eventBroadcaster, clock) recorder := recorderWithFakeClock(api.EventSource{Component: "eventTest"}, eventBroadcaster, clock)
for caseName := range table { for caseName := range table {
clock.Step(1 * time.Second) clock.Step(1 * time.Second)
recorder.Event(ref, "Reason", caseName) recorder.Event(ref, api.EventTypeNormal, "Reason", caseName)
runtime.Gosched() runtime.Gosched()
} }
recorder.Event(ref, "Reason", "finished") recorder.Event(ref, api.EventTypeNormal, "Reason", "finished")
<-done <-done
for caseName, item := range table { for caseName, item := range table {
@@ -484,7 +499,7 @@ func TestLotsOfEvents(t *testing.T) {
} }
for i := 0; i < maxQueuedEvents; i++ { for i := 0; i < maxQueuedEvents; i++ {
// we need to vary the reason to prevent aggregation // we need to vary the reason to prevent aggregation
go recorder.Eventf(ref, "Reason-"+string(i), strconv.Itoa(i)) go recorder.Eventf(ref, api.EventTypeNormal, "Reason-"+string(i), strconv.Itoa(i))
} }
// Make sure no events were dropped by either of the listeners. // Make sure no events were dropped by either of the listeners.
for i := 0; i < maxQueuedEvents; i++ { for i := 0; i < maxQueuedEvents; i++ {
@@ -515,6 +530,7 @@ func TestEventfNoNamespace(t *testing.T) {
} }
table := []struct { table := []struct {
obj k8sruntime.Object obj k8sruntime.Object
eventtype string
reason string reason string
messageFmt string messageFmt string
elements []interface{} elements []interface{}
@@ -524,6 +540,7 @@ func TestEventfNoNamespace(t *testing.T) {
}{ }{
{ {
obj: testRef, obj: testRef,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -544,8 +561,9 @@ func TestEventfNoNamespace(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
} }
@@ -578,7 +596,7 @@ func TestEventfNoNamespace(t *testing.T) {
} }
logCalled <- struct{}{} logCalled <- struct{}{}
}) })
recorder.Eventf(item.obj, item.reason, item.messageFmt, item.elements...) recorder.Eventf(item.obj, item.eventtype, item.reason, item.messageFmt, item.elements...)
<-logCalled <-logCalled
@@ -621,6 +639,7 @@ func TestMultiSinkCache(t *testing.T) {
} }
table := []struct { table := []struct {
obj k8sruntime.Object obj k8sruntime.Object
eventtype string
reason string reason string
messageFmt string messageFmt string
elements []interface{} elements []interface{}
@@ -630,6 +649,7 @@ func TestMultiSinkCache(t *testing.T) {
}{ }{
{ {
obj: testRef, obj: testRef,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -650,12 +670,14 @@ func TestMultiSinkCache(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testPod, obj: testPod,
eventtype: api.EventTypeNormal,
reason: "Killed", reason: "Killed",
messageFmt: "some other verbose message: %v", messageFmt: "some other verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -675,12 +697,14 @@ func TestMultiSinkCache(t *testing.T) {
Message: "some other verbose message: 1", Message: "some other verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:""}): reason: 'Killed' some other verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:""}): type: 'Normal' reason: 'Killed' some other verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testRef, obj: testRef,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -701,12 +725,14 @@ func TestMultiSinkCache(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 2, Count: 2,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
{ {
obj: testRef2, obj: testRef2,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -727,12 +753,14 @@ func TestMultiSinkCache(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testRef, obj: testRef,
eventtype: api.EventTypeNormal,
reason: "Started", reason: "Started",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -753,12 +781,14 @@ func TestMultiSinkCache(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 3, Count: 3,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): reason: 'Started' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"bar", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[2]"}): type: 'Normal' reason: 'Started' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
{ {
obj: testRef2, obj: testRef2,
eventtype: api.EventTypeNormal,
reason: "Stopped", reason: "Stopped",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -779,12 +809,14 @@ func TestMultiSinkCache(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Stopped' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): type: 'Normal' reason: 'Stopped' some verbose message: 1`,
expectUpdate: false, expectUpdate: false,
}, },
{ {
obj: testRef2, obj: testRef2,
eventtype: api.EventTypeNormal,
reason: "Stopped", reason: "Stopped",
messageFmt: "some verbose message: %v", messageFmt: "some verbose message: %v",
elements: []interface{}{1}, elements: []interface{}{1},
@@ -805,8 +837,9 @@ func TestMultiSinkCache(t *testing.T) {
Message: "some verbose message: 1", Message: "some verbose message: 1",
Source: api.EventSource{Component: "eventTest"}, Source: api.EventSource{Component: "eventTest"},
Count: 2, Count: 2,
Type: api.EventTypeNormal,
}, },
expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): reason: 'Stopped' some verbose message: 1`, expectLog: `Event(api.ObjectReference{Kind:"Pod", Namespace:"baz", Name:"foo", UID:"differentUid", APIVersion:"version", ResourceVersion:"", FieldPath:"spec.containers[3]"}): type: 'Normal' reason: 'Stopped' some verbose message: 1`,
expectUpdate: true, expectUpdate: true,
}, },
} }
@@ -844,7 +877,7 @@ func TestMultiSinkCache(t *testing.T) {
sinkWatcher := eventBroadcaster.StartRecordingToSink(&testEvents) sinkWatcher := eventBroadcaster.StartRecordingToSink(&testEvents)
for index, item := range table { for index, item := range table {
clock.Step(1 * time.Second) clock.Step(1 * time.Second)
recorder.Eventf(item.obj, item.reason, item.messageFmt, item.elements...) recorder.Eventf(item.obj, item.eventtype, item.reason, item.messageFmt, item.elements...)
// validate event // validate event
if item.expectUpdate { if item.expectUpdate {
@@ -860,7 +893,7 @@ func TestMultiSinkCache(t *testing.T) {
sinkWatcher2 := eventBroadcaster.StartRecordingToSink(&testEvents2) sinkWatcher2 := eventBroadcaster.StartRecordingToSink(&testEvents2)
for index, item := range table { for index, item := range table {
clock.Step(1 * time.Second) clock.Step(1 * time.Second)
recorder.Eventf(item.obj, item.reason, item.messageFmt, item.elements...) recorder.Eventf(item.obj, item.eventtype, item.reason, item.messageFmt, item.elements...)
// validate event // validate event
if item.expectUpdate { if item.expectUpdate {

1
pkg/client/record/events_cache_test.go
View File

@@ -50,6 +50,7 @@ func makeEvent(reason, message string, involvedObject api.ObjectReference) api.E
Count: 1, Count: 1,
FirstTimestamp: eventTime, FirstTimestamp: eventTime,
LastTimestamp: eventTime, LastTimestamp: eventTime,
Type: api.EventTypeNormal,
} }
return event return event
} }

3
pkg/client/unversioned/events_test.go
View File

@@ -74,6 +74,7 @@ func TestEventCreate(t *testing.T) {
FirstTimestamp: timeStamp, FirstTimestamp: timeStamp,
LastTimestamp: timeStamp, LastTimestamp: timeStamp,
Count: 1, Count: 1,
Type: api.EventTypeNormal,
} }
c := &testClient{ c := &testClient{
Request: testRequest{ Request: testRequest{
@@ -113,6 +114,7 @@ func TestEventGet(t *testing.T) {
FirstTimestamp: timeStamp, FirstTimestamp: timeStamp,
LastTimestamp: timeStamp, LastTimestamp: timeStamp,
Count: 1, Count: 1,
Type: api.EventTypeNormal,
} }
c := &testClient{ c := &testClient{
Request: testRequest{ Request: testRequest{
@@ -152,6 +154,7 @@ func TestEventList(t *testing.T) {
FirstTimestamp: timeStamp, FirstTimestamp: timeStamp,
LastTimestamp: timeStamp, LastTimestamp: timeStamp,
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
}, },
} }

3
pkg/kubectl/describe_test.go
View File

@@ -85,6 +85,7 @@ func TestPodDescribeResultsSorted(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
{ {
Source: api.EventSource{Component: "scheduler"}, Source: api.EventSource{Component: "scheduler"},
@@ -92,6 +93,7 @@ func TestPodDescribeResultsSorted(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
{ {
Source: api.EventSource{Component: "kubelet"}, Source: api.EventSource{Component: "kubelet"},
@@ -99,6 +101,7 @@ func TestPodDescribeResultsSorted(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
}, },
}) })

4
pkg/kubectl/resource_printer_test.go
View File

@@ -507,6 +507,7 @@ func TestPrintEventsResultSorted(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
{ {
Source: api.EventSource{Component: "scheduler"}, Source: api.EventSource{Component: "scheduler"},
@@ -514,6 +515,7 @@ func TestPrintEventsResultSorted(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
{ {
Source: api.EventSource{Component: "kubelet"}, Source: api.EventSource{Component: "kubelet"},
@@ -521,6 +523,7 @@ func TestPrintEventsResultSorted(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
}, },
} }
@@ -902,6 +905,7 @@ func TestPrintHumanReadableWithNamespace(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
isNamespaced: true, isNamespaced: true,
}, },

3
pkg/kubectl/sorted_event_list_test.go
View File

@@ -60,6 +60,7 @@ func TestSortableEvents(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
{ {
Source: api.EventSource{Component: "scheduler"}, Source: api.EventSource{Component: "scheduler"},
@@ -67,6 +68,7 @@ func TestSortableEvents(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
{ {
Source: api.EventSource{Component: "kubelet"}, Source: api.EventSource{Component: "kubelet"},
@@ -74,6 +76,7 @@ func TestSortableEvents(t *testing.T) {
FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)),
LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)),
Count: 1, Count: 1,
Type: api.EventTypeNormal,
}, },
}) })

4
test/e2e/util.go
View File

@@ -1665,8 +1665,8 @@ func dumpNodeDebugInfo(c *client.Client, nodeNames []string) {
Logf("\nLogging kubelet events for node %v", n) Logf("\nLogging kubelet events for node %v", n)
for _, e := range getNodeEvents(c, n) { for _, e := range getNodeEvents(c, n) {
Logf("source %v message %v reason %v first ts %v last ts %v, involved obj %+v", Logf("source %v type %v message %v reason %v first ts %v last ts %v, involved obj %+v",
e.Source, e.Message, e.Reason, e.FirstTimestamp, e.LastTimestamp, e.InvolvedObject) e.Source, e.Type, e.Message, e.Reason, e.FirstTimestamp, e.LastTimestamp, e.InvolvedObject)
} }
Logf("\nLogging pods the kubelet thinks is on node %v", n) Logf("\nLogging pods the kubelet thinks is on node %v", n)
podList, err := GetKubeletPods(c, n) podList, err := GetKubeletPods(c, n)