Update unit test suites

kubernetes-sigs · Jul 11, 2022 · 1921935 · 1921935
1 parent 08c2ef1
commit 1921935
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -26,7 +26,6 @@ import (
 	"sigs.k8s.io/cluster-api-provider-azure/internal/test/env"
 	"sigs.k8s.io/cluster-api-provider-azure/util/reconciler"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -38,13 +37,10 @@ var (
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t, "Controller Suite")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = env.NewTestEnvironment()
 	Expect(NewAzureClusterReconciler(testEnv, testEnv.GetEventRecorderFor("azurecluster-reconciler"), reconciler.DefaultLoopTimeout, "").
@@ -68,9 +64,7 @@ var _ = BeforeSuite(func(done Done) {
 		}
 		return true
 	}).Should(BeTrue())
-
-	close(done)
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	if testEnv != nil {

diff --git a/exp/controllers/suite_test.go b/exp/controllers/suite_test.go
@@ -28,7 +28,6 @@ import (
 	"sigs.k8s.io/cluster-api-provider-azure/internal/test/env"
 	"sigs.k8s.io/cluster-api-provider-azure/util/reconciler"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -41,13 +40,10 @@ var (
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t, "Controller Suite")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	By("bootstrapping test environment")
 	testEnv = env.NewTestEnvironment()
 
@@ -90,9 +86,7 @@ var _ = BeforeSuite(func(done Done) {
 		}
 		return true
 	}).Should(BeTrue())
-
-	close(done)
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	if testEnv != nil {