add blocking runnable to m1

kubernetes-sigs · Mar 25, 2024 · aa2bbaa · aa2bbaa
1 parent 06d575d
commit aa2bbaa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/manager/manager_test.go b/pkg/manager/manager_test.go
@@ -419,8 +419,10 @@ var _ = Describe("manger.Manager", func() {
 				Expect(m2).ToNot(BeNil())
 				Expect(rl.Describe()).To(Equal("default/test-leader-election-id"))
 
+				m1done := make(chan struct{})
 				Expect(m1.Add(RunnableFunc(func(ctx context.Context) error {
 					defer GinkgoRecover()
+					<-m1done
 					return nil
 				}))).To(Succeed())
 
@@ -437,7 +439,7 @@ var _ = Describe("manger.Manager", func() {
 
 				Expect(m2.Add(electionRunnable)).To(Succeed())
 
-				ctx2, cancel := context.WithCancel(context.Background())
+				ctx2, cancel2 := context.WithCancel(context.Background())
 				m2done := make(chan struct{})
 				go func() {
 					defer GinkgoRecover()
@@ -450,8 +452,9 @@ var _ = Describe("manger.Manager", func() {
 					defer GinkgoRecover()
 					Consistently(electionRunnable.ch).ShouldNot(Receive())
 				}()
-				cancel()
+				cancel2()
 				<-m2done
+				<-m1done
 			})
 
 			It("should default ID to controller-runtime if ID is not set", func() {