CI-1658: Remove deprecated async Ginkgo tests

Removed deprecated async Ginkgo tests. Also following the example of controller-runtime: kubernetes-sigs/controller-runtime#1564
gocardless · Nov 30, 2022 · ae30df8 · ae30df8
1 parent c5da0a5
commit ae30df8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/apis/workloads/v1alpha1/integration/priority_suite_test.go b/apis/workloads/v1alpha1/integration/priority_suite_test.go
@@ -32,7 +32,7 @@ func TestSuite(t *testing.T) {
 	RunSpecs(t, "apis/workloads/v1alpha1")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	By("bootstrapping test environment")
@@ -87,5 +87,4 @@ var _ = BeforeSuite(func(done Done) {
 		Expect(err).ToNot(HaveOccurred())
 	}()
 
-	close(done)
 }, 60)
diff --git a/controllers/rbac/directoryrolebinding/integration/suite_test.go b/controllers/rbac/directoryrolebinding/integration/suite_test.go
@@ -32,7 +32,7 @@ func TestSuite(t *testing.T) {
 	RunSpecs(t, "controllers/rbac/integration")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	By("bootstrapping test environment")
@@ -91,5 +91,4 @@ var _ = BeforeSuite(func(done Done) {
 		Expect(err).ToNot(HaveOccurred())
 	}()
 
-	close(done)
 }, 60)
diff --git a/controllers/workloads/console/integration/suite_test.go b/controllers/workloads/console/integration/suite_test.go
@@ -35,7 +35,7 @@ func TestSuite(t *testing.T) {
 	RunSpecs(t, "controllers/workloads/integration")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
@@ -124,5 +124,4 @@ var _ = BeforeSuite(func(done Done) {
 		Expect(err).ToNot(HaveOccurred())
 	}()
 
-	close(done)
 }, 60)
diff --git a/pkg/workloads/console/runner/integration/suite_test.go b/pkg/workloads/console/runner/integration/suite_test.go
@@ -34,7 +34,7 @@ func TestSuite(t *testing.T) {
 	RunSpecs(t, "pkg/workloads/console/runner/integration")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	By("bootstrapping test environment")
@@ -61,7 +61,6 @@ var _ = BeforeSuite(func(done Done) {
 	kubeClient, err = client.New(cfg, client.Options{Scheme: scheme})
 	Expect(err).NotTo(HaveOccurred(), "could not create client")
 
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {