Merge pull request #111545 from jlsong01/rewrite_signature_of_StartEventWatcher
rewrite signature of function StartEventWatcher
This commit is contained in:
@@ -411,7 +411,7 @@ func TestSchedulerMultipleProfilesScheduling(t *testing.T) {
|
||||
return true, binding, nil
|
||||
})
|
||||
controllers := make(map[string]string)
|
||||
stopFn := broadcaster.StartEventWatcher(func(obj runtime.Object) {
|
||||
stopFn, err := broadcaster.StartEventWatcher(func(obj runtime.Object) {
|
||||
e, ok := obj.(*eventsv1.Event)
|
||||
if !ok || e.Reason != "Scheduled" {
|
||||
return
|
||||
@@ -419,6 +419,9 @@ func TestSchedulerMultipleProfilesScheduling(t *testing.T) {
|
||||
controllers[e.Regarding.Name] = e.ReportingController
|
||||
wg.Done()
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer stopFn()
|
||||
|
||||
// Run scheduler.
|
||||
@@ -605,13 +608,16 @@ func TestSchedulerScheduleOne(t *testing.T) {
|
||||
fwk.EventRecorder().Eventf(p.Pod, nil, v1.EventTypeWarning, "FailedScheduling", "Scheduling", msg)
|
||||
}
|
||||
called := make(chan struct{})
|
||||
stopFunc := eventBroadcaster.StartEventWatcher(func(obj runtime.Object) {
|
||||
stopFunc, err := eventBroadcaster.StartEventWatcher(func(obj runtime.Object) {
|
||||
e, _ := obj.(*eventsv1.Event)
|
||||
if e.Reason != item.eventReason {
|
||||
t.Errorf("got event %v, want %v", e.Reason, item.eventReason)
|
||||
}
|
||||
close(called)
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sched.scheduleOne(ctx)
|
||||
<-called
|
||||
if e, a := item.expectAssumedPod, gotAssumedPod; !reflect.DeepEqual(e, a) {
|
||||
@@ -948,13 +954,16 @@ func TestSchedulerWithVolumeBinding(t *testing.T) {
|
||||
fakeVolumeBinder := volumebinding.NewFakeVolumeBinder(item.volumeBinderConfig)
|
||||
s, bindingChan, errChan := setupTestSchedulerWithVolumeBinding(ctx, t, fakeVolumeBinder, eventBroadcaster)
|
||||
eventChan := make(chan struct{})
|
||||
stopFunc := eventBroadcaster.StartEventWatcher(func(obj runtime.Object) {
|
||||
stopFunc, err := eventBroadcaster.StartEventWatcher(func(obj runtime.Object) {
|
||||
e, _ := obj.(*eventsv1.Event)
|
||||
if e, a := item.eventReason, e.Reason; e != a {
|
||||
t.Errorf("expected %v, got %v", e, a)
|
||||
}
|
||||
close(eventChan)
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
s.scheduleOne(ctx)
|
||||
// Wait for pod to succeed or fail scheduling
|
||||
select {
|
||||
|
Reference in New Issue
Block a user