Merge pull request #28 from lichuqiang/covererage_fix

Get source related tests to 100% coverage

Author: k8s-ci-robot

pkg/manager/manager_test.go

@@ -270,6 +270,12 @@ var _ = Describe("manger.Manager", func() {
 					Expect(c).To(Equal(m.GetCache()))
 					return nil
 				},
+				stop: func(stop <-chan struct{}) error {
+					defer GinkgoRecover()
+					// Manager stop chan has not been initialized.
+					Expect(stop).To(BeNil())
+					return nil
+				},
 				f: func(f inject.Func) error {
 					defer GinkgoRecover()
 					Expect(f).NotTo(BeNil())
@@ -315,6 +321,12 @@ var _ = Describe("manger.Manager", func() {
 				},
 			})
 			Expect(err).To(Equal(expected))
+			err = m.SetFields(&injectable{
+				stop: func(<-chan struct{}) error {
+					return expected
+				},
+			})
+			Expect(err).To(Equal(expected))
 			close(done)
 		})
 	})
@@ -374,13 +386,15 @@ var _ inject.Cache = &injectable{}
 var _ inject.Client = &injectable{}
 var _ inject.Scheme = &injectable{}
 var _ inject.Config = &injectable{}
+var _ inject.Stoppable = &injectable{}
 
 type injectable struct {
 	scheme func(scheme *runtime.Scheme) error
 	client func(client.Client) error
 	config func(config *rest.Config) error
 	cache  func(cache.Cache) error
 	f      func(inject.Func) error
+	stop   func(<-chan struct{}) error
 }
 
 func (i *injectable) InjectCache(c cache.Cache) error {
@@ -418,6 +432,13 @@ func (i *injectable) InjectFunc(f inject.Func) error {
 	return i.f(f)
 }
 
+func (i *injectable) InjectStopChannel(stop <-chan struct{}) error {
+	if i.stop == nil {
+		return nil
+	}
+	return i.stop(stop)
+}
+
 func (i *injectable) Start(<-chan struct{}) error {
 	return nil
 }

pkg/source/source_test.go

@@ -22,12 +22,12 @@ import (
 	"github.com/kubernetes-sigs/controller-runtime/pkg/cache/informertest"
 	"github.com/kubernetes-sigs/controller-runtime/pkg/event"
 	"github.com/kubernetes-sigs/controller-runtime/pkg/handler"
+	"github.com/kubernetes-sigs/controller-runtime/pkg/predicate"
 	"github.com/kubernetes-sigs/controller-runtime/pkg/runtime/inject"
 	"github.com/kubernetes-sigs/controller-runtime/pkg/source"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/kubernetes-sigs/controller-runtime/pkg/predicate"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/util/workqueue"
@@ -276,6 +276,15 @@ var _ = Describe("Source", func() {
 					Object: p,
 					Meta:   p,
 				}
+				// Event that should be filtered out by predicates
+				invalidEvt := event.GenericEvent{}
+
+				// Predicate to filter out empty event
+				prct := predicate.Funcs{
+					GenericFunc: func(e event.GenericEvent) bool {
+						return e.Object != nil && e.Meta != nil
+					},
+				}
 
 				q := workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "test")
 				instance := &source.Channel{Source: ch}
@@ -295,14 +304,17 @@ var _ = Describe("Source", func() {
 					},
 					GenericFunc: func(q2 workqueue.RateLimitingInterface, evt event.GenericEvent) {
 						defer GinkgoRecover()
+						// The empty event should have been filtered out by the predicates,
+						// and will not be passed to the handler.
 						Expect(q2).To(Equal(q))
 						Expect(evt.Meta).To(Equal(p))
 						Expect(evt.Object).To(Equal(p))
 						close(c)
 					},
-				}, q)
+				}, q, prct)
 				Expect(err).NotTo(HaveOccurred())
 
+				ch <- invalidEvt
 				ch <- evt
 				<-c
 				close(done)