Remove race condition from templated StartTestManager

kubernetes-sigs · Jan 18, 2019 · ffe210e · ffe210e
1 parent cb3a7e0
commit ffe210e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/scaffold/controller/controllersuitetest.go b/pkg/scaffold/controller/controllersuitetest.go
@@ -96,10 +96,10 @@ func SetupTestReconcile(inner reconcile.Reconciler) (reconcile.Reconciler, chan
 func StartTestManager(mgr manager.Manager, g *gomega.GomegaWithT) (chan struct{}, *sync.WaitGroup) {
 	stop := make(chan struct{})
 	wg := &sync.WaitGroup{}
+	wg.Add(1)
 	go func() {
-		wg.Add(1)
+		defer wg.Done()
 		g.Expect(mgr.Start(stop)).NotTo(gomega.HaveOccurred())
-		wg.Done()
 	}()
 	return stop, wg
 }