Merge pull request #3041 from jonathanbeber/backport_3306_07

[backport 0.7] Remove os.Exit calls from TestMain
kubernetes-sigs · Dec 21, 2021 · a79d123 · a79d123
2 parents ec1da9b + 040ba7a
commit a79d123
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 50 deletions.
diff --git a/api/v1alpha3/webhook_suite_test.go b/api/v1alpha3/webhook_suite_test.go
@@ -18,7 +18,6 @@ package v1alpha3
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -52,11 +51,9 @@ func TestAPIs(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {

diff --git a/api/v1alpha4/suite_test.go b/api/v1alpha4/suite_test.go
@@ -18,7 +18,6 @@ package v1alpha4
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -47,9 +46,8 @@ func TestAPIs(t *testing.T) {
 
 func TestMain(m *testing.M) {
 	setup()
-	code := m.Run()
-	teardown()
-	os.Exit(code)
+	defer teardown()
+	m.Run()
 }
 
 func setup() {

diff --git a/bootstrap/eks/api/v1alpha3/webhook_suite_test.go b/bootstrap/eks/api/v1alpha3/webhook_suite_test.go
@@ -18,7 +18,6 @@ package v1alpha3
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -36,21 +35,19 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {
 	utilruntime.Must(AddToScheme(scheme.Scheme))
 	utilruntime.Must(bootstrapv1alpha4.AddToScheme(scheme.Scheme))
 
 	testEnvConfig := helpers.NewTestEnvironmentConfiguration([]string{
-		path.Join("bootstrap", "eks", "config", "crd", "bases"),
+		path.Join("config", "crd", "bases"),
 	},
-	).WithWebhookConfiguration("unmanaged", path.Join("bootstrap", "eks", "config", "webhook", "manifests.yaml"))
+	).WithWebhookConfiguration("unmanaged", path.Join("config", "webhook", "manifests.yaml"))
 	var err error
 	testEnv, err = testEnvConfig.Build()
 	if err != nil {

diff --git a/bootstrap/eks/controllers/suite_test.go b/bootstrap/eks/controllers/suite_test.go
@@ -18,7 +18,6 @@ package controllers
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -37,11 +36,8 @@ var (
 
 func TestMain(m *testing.M) {
 	setup()
-	defer func() {
-		teardown()
-	}()
-	code := m.Run()
-	os.Exit(code) // nolint:gocritic
+	defer teardown()
+	m.Run()
 }
 
 func setup() {

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -18,7 +18,6 @@ package controllers
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -37,11 +36,9 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {

diff --git a/controlplane/eks/api/v1alpha3/webhook_suite_test.go b/controlplane/eks/api/v1alpha3/webhook_suite_test.go
@@ -18,7 +18,6 @@ package v1alpha3
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -36,19 +35,17 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {
 	utilruntime.Must(AddToScheme(scheme.Scheme))
 	utilruntime.Must(controlplanev1alpha4.AddToScheme(scheme.Scheme))
 
 	testEnvConfig := helpers.NewTestEnvironmentConfiguration([]string{
-		path.Join("..", "config", "crd", "bases"),
+		path.Join("config", "crd", "bases"),
 	},
 	).WithWebhookConfiguration("unmanaged", path.Join("config", "webhook", "manifests.yaml"))
 	var err error

diff --git a/controlplane/eks/api/v1alpha4/suite_test.go b/controlplane/eks/api/v1alpha4/suite_test.go
@@ -18,7 +18,6 @@ package v1alpha4
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -35,9 +34,8 @@ var (
 
 func TestMain(m *testing.M) {
 	setup()
-	code := m.Run()
-	teardown()
-	os.Exit(code)
+	defer teardown()
+	m.Run()
 }
 
 func setup() {

diff --git a/exp/api/v1alpha3/webhook_suite_test.go b/exp/api/v1alpha3/webhook_suite_test.go
@@ -18,7 +18,6 @@ package v1alpha3
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -51,11 +50,9 @@ func TestAPIs(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {

diff --git a/exp/controlleridentitycreator/suite_test.go b/exp/controlleridentitycreator/suite_test.go
@@ -18,7 +18,6 @@ package controlleridentitycreator
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -43,11 +42,9 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {
@@ -57,7 +54,6 @@ func setup() {
 
 	testEnvConfig := helpers.NewTestEnvironmentConfiguration([]string{
 		path.Join("config", "crd", "bases"),
-		path.Join("controlplane", "eks", "config", "crd", "bases"),
 	},
 	).WithWebhookConfiguration("unmanaged", path.Join("config", "webhook", "manifests.yaml"))
 	var err error

diff --git a/exp/controllers/suite_test.go b/exp/controllers/suite_test.go
@@ -18,7 +18,6 @@ package controllers
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -42,11 +41,9 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {

diff --git a/exp/instancestate/suite_test.go b/exp/instancestate/suite_test.go
@@ -18,7 +18,6 @@ package instancestate
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"testing"
 
@@ -47,11 +46,9 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	code := 0
-	defer func() { os.Exit(code) }()
 	setup()
 	defer teardown()
-	code = m.Run()
+	m.Run()
 }
 
 func setup() {