From ca5dc73a7648ba6f3e6201b0dbbb35828fe634dd Mon Sep 17 00:00:00 2001 From: Adam Snyder Date: Sun, 19 Sep 2021 21:25:21 -0700 Subject: [PATCH] Defer GinkgoRecover() in test goroutines Add a `defer GinkgoRecover()` call to the beginning of async functions in test code so that assertion failures will be shown to the user on failure. Signed-off-by: Adam Snyder --- .../testdata/project/apis/batch/v1/webhook_suite_test.go | 1 + .../testdata/project/api/v1/webhook_suite_test.go | 1 + .../testdata/project/api/v1/webhook_suite_test.go | 1 + .../testdata/project/api/v2/webhook_suite_test.go | 1 + .../v3/scaffolds/internal/templates/api/webhook_suitetest.go | 1 + testdata/project-v3-config/api/v1/webhook_suite_test.go | 1 + .../project-v3-multigroup/apis/crew/v1/webhook_suite_test.go | 1 + .../project-v3-multigroup/apis/ship/v1/webhook_suite_test.go | 1 + .../apis/ship/v2alpha1/webhook_suite_test.go | 1 + testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go | 1 + testdata/project-v3/api/v1/webhook_suite_test.go | 1 + 11 files changed, 11 insertions(+) diff --git a/docs/book/src/component-config-tutorial/testdata/project/apis/batch/v1/webhook_suite_test.go b/docs/book/src/component-config-tutorial/testdata/project/apis/batch/v1/webhook_suite_test.go index 7dc14b3a67d..a4e8a0e3283 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/apis/batch/v1/webhook_suite_test.go +++ b/docs/book/src/component-config-tutorial/testdata/project/apis/batch/v1/webhook_suite_test.go @@ -105,6 +105,7 @@ var _ = BeforeSuite(func() { // +kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go index 93992eb037c..7c9bc36820c 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go +++ b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go @@ -106,6 +106,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go index 93992eb037c..7c9bc36820c 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go +++ b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go @@ -106,6 +106,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go index b1bbe50e5c4..25ac2b6c096 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go +++ b/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go @@ -106,6 +106,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go index 7f30dd89f37..e88e2dc4253 100644 --- a/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go +++ b/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go @@ -201,6 +201,7 @@ var _ = BeforeSuite(func() { %s go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/testdata/project-v3-config/api/v1/webhook_suite_test.go b/testdata/project-v3-config/api/v1/webhook_suite_test.go index 43228484af7..6f18b5b38bd 100644 --- a/testdata/project-v3-config/api/v1/webhook_suite_test.go +++ b/testdata/project-v3-config/api/v1/webhook_suite_test.go @@ -112,6 +112,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/testdata/project-v3-multigroup/apis/crew/v1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/crew/v1/webhook_suite_test.go index 5b9d16e17f8..7f24dfb5dc2 100644 --- a/testdata/project-v3-multigroup/apis/crew/v1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/crew/v1/webhook_suite_test.go @@ -106,6 +106,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/testdata/project-v3-multigroup/apis/ship/v1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/ship/v1/webhook_suite_test.go index 6ba47881339..c121db67199 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/ship/v1/webhook_suite_test.go @@ -106,6 +106,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/testdata/project-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go index c3db3fd9eb5..03a2188cab7 100644 --- a/testdata/project-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go @@ -106,6 +106,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go index fea74267a93..ee2c1763498 100644 --- a/testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go @@ -106,6 +106,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred()) diff --git a/testdata/project-v3/api/v1/webhook_suite_test.go b/testdata/project-v3/api/v1/webhook_suite_test.go index 1dabe80a540..33bc3089190 100644 --- a/testdata/project-v3/api/v1/webhook_suite_test.go +++ b/testdata/project-v3/api/v1/webhook_suite_test.go @@ -118,6 +118,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:webhook go func() { + defer GinkgoRecover() err = mgr.Start(ctx) if err != nil { Expect(err).NotTo(HaveOccurred())