Remove async behavior of BeforeSuite

Signed-off-by: Vince Prignano <vincepri@vmware.com>
kubernetes-sigs · Jan 19, 2021 · d9d0c55 · d9d0c55
1 parent 96c1664
commit d9d0c55
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/bootstrap/kubeadm/controllers/suite_test.go b/bootstrap/kubeadm/controllers/suite_test.go
@@ -44,7 +44,7 @@ func TestAPIs(t *testing.T) {
 		[]Reporter{printer.NewlineReporter{}})
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = helpers.NewTestEnvironment()
 
@@ -55,7 +55,6 @@ var _ = BeforeSuite(func(done Done) {
 	}()
 
 	<-testEnv.Manager.Elected()
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {

diff --git a/controllers/remote/suite_test.go b/controllers/remote/suite_test.go
@@ -49,7 +49,7 @@ func TestGinkgoSuite(t *testing.T) {
 		[]Reporter{printer.NewlineReporter{}})
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = helpers.NewTestEnvironment()
 
@@ -60,7 +60,6 @@ var _ = BeforeSuite(func(done Done) {
 	}()
 
 	<-testEnv.Manager.Elected()
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {

diff --git a/exp/addons/controllers/suite_test.go b/exp/addons/controllers/suite_test.go
@@ -47,7 +47,7 @@ func TestAPIs(t *testing.T) {
 		[]Reporter{printer.NewlineReporter{}})
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = helpers.NewTestEnvironment()
 	trckr, err := remote.NewClusterCacheTracker(log.NullLogger{}, testEnv.Manager)
@@ -67,7 +67,6 @@ var _ = BeforeSuite(func(done Done) {
 	}()
 
 	<-testEnv.Manager.Elected()
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {

diff --git a/exp/controllers/suite_test.go b/exp/controllers/suite_test.go
@@ -45,7 +45,7 @@ func TestAPIs(t *testing.T) {
 		[]Reporter{printer.NewlineReporter{}})
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = helpers.NewTestEnvironment()
 
@@ -61,7 +61,6 @@ var _ = BeforeSuite(func(done Done) {
 	}()
 
 	<-testEnv.Manager.Elected()
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {

diff --git a/util/patch/suite_test.go b/util/patch/suite_test.go
@@ -49,7 +49,7 @@ func TestPatch(t *testing.T) {
 		[]Reporter{printer.NewlineReporter{}})
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = helpers.NewTestEnvironment()
 
@@ -60,7 +60,6 @@ var _ = BeforeSuite(func(done Done) {
 	}()
 
 	<-testEnv.Manager.Elected()
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {