Merge pull request kubernetes#80666 from oomichi/cleanup-ResourceEventHandlerFuncs

k8s-ci-robot · web-flow · commit 269183a7a83a · 2019-07-30T10:09:43.000-07:00
Remove duplicated check in ObserveEventAfterAction
diff --git a/test/e2e/common/events.go b/test/e2e/common/events.go
@@ -121,7 +121,7 @@ func ObserveEventAfterAction(f *framework.Framework, eventPredicate func(*v1.Eve
 				e, ok := obj.(*v1.Event)
 				ginkgo.By(fmt.Sprintf("Considering event: \nType = [%s], Name = [%s], Reason = [%s], Message = [%s]", e.Type, e.Name, e.Reason, e.Message))
 				framework.ExpectEqual(ok, true)
-				if ok && eventPredicate(e) {
+				if eventPredicate(e) {
 					observedMatchingEvent = true
 				}
 			},

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func ObserveEventAfterAction(f framework.Framework, eventPredicate func(v1.Eve`
`121`	`121`	`e, ok := obj.(*v1.Event)`
`122`	`122`	`ginkgo.By(fmt.Sprintf("Considering event: \nType = [%s], Name = [%s], Reason = [%s], Message = [%s]", e.Type, e.Name, e.Reason, e.Message))`
`123`	`123`	`framework.ExpectEqual(ok, true)`
`124`		`- if ok && eventPredicate(e) {`
	`124`	`+ if eventPredicate(e) {`
`125`	`125`	`observedMatchingEvent = true`
`126`	`126`	`}`
`127`	`127`	`},`