From ae30df8b0d52e7fb16ece896f8ac6370d811fe77 Mon Sep 17 00:00:00 2001
From: Nabil372 <abelahouane@gocardless.com>
Date: Mon, 14 Nov 2022 17:40:22 +0000
Subject: [PATCH] CI-1658: Remove deprecated async Ginkgo tests

Removed deprecated async Ginkgo tests.

Also following the example of controller-runtime:
https://github.com/kubernetes-sigs/controller-runtime/pull/1564
---
 apis/workloads/v1alpha1/integration/priority_suite_test.go     | 3 +--
 .../rbac/directoryrolebinding/integration/suite_test.go        | 3 +--
 controllers/workloads/console/integration/suite_test.go        | 3 +--
 pkg/workloads/console/runner/integration/suite_test.go         | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apis/workloads/v1alpha1/integration/priority_suite_test.go b/apis/workloads/v1alpha1/integration/priority_suite_test.go
index fda44b2d..0640b0d7 100644
--- 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
index d1011043..0eb089aa 100644
--- 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
index 1dc06921..054e0953 100644
--- 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
index 7a083e77..cf370211 100644
--- 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() {