Rafactor Start test suite

Author: JoelSpeed

pkg/manager/manager_test.go

@@ -115,100 +115,9 @@ var _ = Describe("manger.Manager", func() {
 	})
 
 	Describe("Start", func() {
-		It("should Start each Component", func(done Done) {
-			m, err := New(cfg, Options{})
-			Expect(err).NotTo(HaveOccurred())
-			c1 := make(chan struct{})
-			m.Add(RunnableFunc(func(s <-chan struct{}) error {
-				defer close(c1)
-				defer GinkgoRecover()
-				return nil
-			}))
-
-			c2 := make(chan struct{})
-			m.Add(RunnableFunc(func(s <-chan struct{}) error {
-				defer close(c2)
-				defer GinkgoRecover()
-				return nil
-			}))
-
-			go func() {
-				defer GinkgoRecover()
-				Expect(m.Start(stop)).NotTo(HaveOccurred())
-			}()
-			<-c1
-			<-c2
-
-			close(done)
-		})
-
-		It("should stop when stop is called", func(done Done) {
-			m, err := New(cfg, Options{})
-			Expect(err).NotTo(HaveOccurred())
-			s := make(chan struct{})
-			close(s)
-			Expect(m.Start(s)).NotTo(HaveOccurred())
-
-			close(done)
-		})
-
-		It("should return an error if it can't start the cache", func(done Done) {
-			m, err := New(cfg, Options{})
-			Expect(err).NotTo(HaveOccurred())
-			mgr, ok := m.(*controllerManager)
-			Expect(ok).To(BeTrue())
-			mgr.startCache = func(stop <-chan struct{}) error {
-				return fmt.Errorf("expected error")
-			}
-			Expect(m.Start(stop).Error()).To(ContainSubstring("expected error"))
-
-			close(done)
-		})
-
-		It("should return an error if any Components fail to Start", func(done Done) {
-			m, err := New(cfg, Options{})
-			Expect(err).NotTo(HaveOccurred())
-			c1 := make(chan struct{})
-			m.Add(RunnableFunc(func(s <-chan struct{}) error {
-				defer GinkgoRecover()
-				defer close(c1)
-				return nil
-			}))
-
-			c2 := make(chan struct{})
-			m.Add(RunnableFunc(func(s <-chan struct{}) error {
-				defer GinkgoRecover()
-				defer close(c2)
-				return fmt.Errorf("expected error")
-			}))
-
-			c3 := make(chan struct{})
-			m.Add(RunnableFunc(func(s <-chan struct{}) error {
-				defer GinkgoRecover()
-				defer close(c3)
-				return nil
-			}))
-
-			go func() {
-				defer GinkgoRecover()
-				Expect(m.Start(stop)).NotTo(HaveOccurred())
-				close(done)
-			}()
-			<-c1
-			<-c2
-			<-c3
-		})
-
-		Context("with leaderelection enabled", func() {
-			opts := Options{
-				LeaderElection:          true,
-				LeaderElectionID:        "controller-runtime",
-				LeaderElectionNamespace: "default",
-				newResourceLock:         fakeleaderelection.NewFakeResourceLock,
-			}
-
+		var startSuite = func(options Options) {
 			It("should Start each Component", func(done Done) {
-				m, err := New(cfg, opts)
+				m, err := New(cfg, options)
 				Expect(err).NotTo(HaveOccurred())
 				c1 := make(chan struct{})
 				m.Add(RunnableFunc(func(s <-chan struct{}) error {
@@ -235,7 +144,7 @@ var _ = Describe("manger.Manager", func() {
 			})
 
 			It("should stop when stop is called", func(done Done) {
-				m, err := New(cfg, opts)
+				m, err := New(cfg, options)
 				Expect(err).NotTo(HaveOccurred())
 				s := make(chan struct{})
 				close(s)
@@ -245,7 +154,7 @@ var _ = Describe("manger.Manager", func() {
 			})
 
 			It("should return an error if it can't start the cache", func(done Done) {
-				m, err := New(cfg, opts)
+				m, err := New(cfg, options)
 				Expect(err).NotTo(HaveOccurred())
 				mgr, ok := m.(*controllerManager)
 				Expect(ok).To(BeTrue())
@@ -255,10 +164,10 @@ var _ = Describe("manger.Manager", func() {
 				Expect(m.Start(stop).Error()).To(ContainSubstring("expected error"))
 
 				close(done)
-			}, 5)
+			})
 
 			It("should return an error if any Components fail to Start", func(done Done) {
-				m, err := New(cfg, opts)
+				m, err := New(cfg, options)
 				Expect(err).NotTo(HaveOccurred())
 				c1 := make(chan struct{})
 				m.Add(RunnableFunc(func(s <-chan struct{}) error {
@@ -290,6 +199,19 @@ var _ = Describe("manger.Manager", func() {
 				<-c2
 				<-c3
 			})
+		}
+
+		Context("with defaults", func() {
+			startSuite(Options{})
+		})
+
+		Context("with leaderelection enabled", func() {
+			startSuite(Options{
+				LeaderElection:          true,
+				LeaderElectionID:        "controller-runtime",
+				LeaderElectionNamespace: "default",
+				newResourceLock:         fakeleaderelection.NewFakeResourceLock,
+			})
 		})
 	})