From d8ed845cb7f05c8fca0d7ad72a3532ee1a3fefec Mon Sep 17 00:00:00 2001
From: razo7 <oraz@redhat.com>
Date: Mon, 2 Jan 2023 17:57:04 +0200
Subject: [PATCH] Ginkgo v2 changes

---
 Makefile                          | 2 +-
 api/v1beta1/webhook_suite_test.go | 8 ++------
 controllers/suite_test.go         | 8 ++------
 hack/functest.sh                  | 6 +++---
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 6954fb52a..bc968289c 100755
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ test: test-no-verify verify-unchanged ## Generate and format code, run tests, ge
 
 .PHONY: test-no-verify
 test-no-verify: manifests generate go-verify fmt vet envtest ginkgo ## Generate and format code, and run tests
-	ACK_GINKGO_DEPRECATIONS=$(GINKGO_VERSION) KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" $(GINKGO) -v -r --keepGoing -requireSuite ./api/... ./controllers/... -coverprofile cover.out
+	ACK_GINKGO_DEPRECATIONS=$(GINKGO_VERSION) KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" $(GINKGO) -v -r --keep-going -require-suite ./api/... ./controllers/... -coverprofile cover.out
 
 ##@ Build
 
diff --git a/api/v1beta1/webhook_suite_test.go b/api/v1beta1/webhook_suite_test.go
index b797f6721..753e0a454 100644
--- a/api/v1beta1/webhook_suite_test.go
+++ b/api/v1beta1/webhook_suite_test.go
@@ -38,7 +38,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
@@ -54,10 +53,7 @@ var cancel context.CancelFunc
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Webhook Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t, "Webhook Suite")
 }
 
 var _ = BeforeSuite(func() {
@@ -136,7 +132,7 @@ var _ = BeforeSuite(func() {
 		return nil
 	}).Should(Succeed())
 
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	cancel()
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
index d56d05193..0ca8a477a 100644
--- a/controllers/suite_test.go
+++ b/controllers/suite_test.go
@@ -29,7 +29,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
@@ -47,10 +46,7 @@ var ctxFromSignalHandler context.Context
 
 func TestControllers(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t, "Controller Suite")
 }
 
 var _ = BeforeSuite(func() {
@@ -58,7 +54,7 @@ var _ = BeforeSuite(func() {
 
 	// call start or refactor when moving to "normal" testEnv test
 
-}, 60)
+})
 
 func startTestEnv() {
 	By("bootstrapping test environment")
diff --git a/hack/functest.sh b/hack/functest.sh
index 71c93e54c..77fa4293f 100755
--- a/hack/functest.sh
+++ b/hack/functest.sh
@@ -27,9 +27,9 @@ fi
 
 # -v: print out the text and location for each spec before running it and flush output to stdout in realtime
 # -r: run suites recursively
-# --keepGoing: don't stop on failing suite
-# -requireSuite: fail if tests are not executed because of missing suite
-ACK_GINKGO_DEPRECATIONS=$1 ./bin/ginkgo/$1/ginkgo $NO_COLOR -v -r --keepGoing -requireSuite ./test/e2e
+# --keep-going: don't stop on failing suite
+# -require-suite: fail if tests are not executed because of missing suite
+ACK_GINKGO_DEPRECATIONS=$1 ./bin/ginkgo/$1/ginkgo $NO_COLOR -v -r --keep-going -require-suite ./test/e2e
 
 if [[ $? != 0 ]]; then
     echo "E2e tests FAILED"