remove suitName constants

kubernetes-sigs · Aug 25, 2022 · 30c1f85 · 30c1f85
1 parent 8060863
commit 30c1f85
Show file tree

Hide file tree

Showing 36 changed files with 38 additions and 109 deletions.
diff --git a/pkg/builder/builder_suite_test.go b/pkg/builder/builder_suite_test.go
@@ -35,11 +35,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
-const suiteName = "application Suite"
-
 func TestBuilder(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "application Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/cache/cache_suite_test.go b/pkg/cache/cache_suite_test.go
@@ -28,11 +28,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Cache Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Cache Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/cache/internal/internal_suite_test.go b/pkg/cache/internal/internal_suite_test.go
@@ -23,9 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Cache Internal Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Cache Internal Suite")
 }
diff --git a/pkg/certwatcher/certwatcher_suite_test.go b/pkg/certwatcher/certwatcher_suite_test.go
@@ -27,14 +27,13 @@ import (
 )
 
 var (
-	certPath  = "testdata/tls.crt"
-	keyPath   = "testdata/tls.key"
-	suiteName = "CertWatcher Suite"
+	certPath = "testdata/tls.crt"
+	keyPath  = "testdata/tls.key"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "CertWatcher Suite")
 }
 
 var _ = BeforeSuite(func() {

diff --git a/pkg/client/apiutil/apiutil_suite_test.go b/pkg/client/apiutil/apiutil_suite_test.go
@@ -27,11 +27,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "API Utilities Test Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "API Utilities Test Suite")
 }
 
 var cfg *rest.Config

diff --git a/pkg/client/client_suite_test.go b/pkg/client/client_suite_test.go
@@ -31,11 +31,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Client Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Client Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/client/config/config_suite_test.go b/pkg/client/config/config_suite_test.go
@@ -26,11 +26,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Client Config Test Suite"
-
 func TestConfig(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Client Config Test Suite")
 }
 
 var _ = BeforeSuite(func() {

diff --git a/pkg/client/fake/client_suite_test.go b/pkg/client/fake/client_suite_test.go
@@ -26,11 +26,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Fake client Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Fake client Suite")
 }
 
 var _ = BeforeSuite(func() {

diff --git a/pkg/cluster/cluster_suite_test.go b/pkg/cluster/cluster_suite_test.go
@@ -29,11 +29,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Cluster Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Cluster Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/config/config_suite_test.go b/pkg/config/config_suite_test.go
@@ -23,9 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Config Suite"
-
 func TestScheme(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Config Suite")
 }
diff --git a/pkg/controller/controller_suite_test.go b/pkg/controller/controller_suite_test.go
@@ -35,11 +35,9 @@ import (
 	crscheme "sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
-const suiteName = "Controller Integration Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Controller Integration Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/controller/controllerutil/controllerutil_suite_test.go b/pkg/controller/controllerutil/controllerutil_suite_test.go
@@ -27,11 +27,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 )
 
-const suiteName = "Controllerutil Suite"
-
 func TestControllerutil(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Controllerutil Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/envtest/envtest_suite_test.go b/pkg/envtest/envtest_suite_test.go
@@ -28,11 +28,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Envtest Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Envtest Suite")
 }
 
 var env *Environment

diff --git a/pkg/finalizer/finalizer_test.go b/pkg/finalizer/finalizer_test.go
@@ -21,11 +21,9 @@ func (f mockFinalizer) Finalize(context.Context, client.Object) (Result, error)
 	return f.result, f.err
 }
 
-const suiteName = "Finalizer Suite"
-
 func TestFinalizer(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Finalizer Suite")
 }
 
 var _ = Describe("TestFinalizer", func() {

diff --git a/pkg/handler/eventhandler_suite_test.go b/pkg/handler/eventhandler_suite_test.go
@@ -27,11 +27,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Eventhandler Suite"
-
 func TestEventhandler(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Eventhandler Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/healthz/healthz_suite_test.go b/pkg/healthz/healthz_suite_test.go
@@ -25,11 +25,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Healthz Suite"
-
 func TestHealthz(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Healthz Suite")
 }
 
 var _ = BeforeSuite(func() {

diff --git a/pkg/internal/controller/controller_suite_test.go b/pkg/internal/controller/controller_suite_test.go
@@ -28,11 +28,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Controller internal Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Controller internal Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/internal/recorder/recorder_suite_test.go b/pkg/internal/recorder/recorder_suite_test.go
@@ -28,11 +28,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Recorder Integration Suite"
-
 func TestRecorder(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Recorder Integration Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/internal/testing/addr/addr_suite_test.go b/pkg/internal/testing/addr/addr_suite_test.go
@@ -23,10 +23,8 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Addr Suite"
-
 func TestAddr(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Addr Suite")
 }
diff --git a/pkg/internal/testing/certs/certs_suite_test.go b/pkg/internal/testing/certs/certs_suite_test.go
@@ -23,10 +23,8 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "TinyCA (Internal Certs) Suite"
-
 func TestInternal(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "TinyCA (Internal Certs) Suite")
 }
diff --git a/pkg/internal/testing/controlplane/controlplane_suite_test.go b/pkg/internal/testing/controlplane/controlplane_suite_test.go
@@ -23,10 +23,8 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Control Plane Standup Unit Tests"
-
 func TestIntegration(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Control Plane Standup Unit Tests")
 }
diff --git a/pkg/internal/testing/process/process_suite_test.go b/pkg/internal/testing/process/process_suite_test.go
@@ -23,10 +23,8 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Envtest Process Launcher Suite"
-
 func TestInternal(t *testing.T) {
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Envtest Process Launcher Suite")
 }
diff --git a/pkg/log/log_suite_test.go b/pkg/log/log_suite_test.go
@@ -23,9 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Log Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Log Suite")
 }
diff --git a/pkg/log/zap/zap_suite_test.go b/pkg/log/zap/zap_suite_test.go
@@ -23,9 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Zap Log Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Zap Log Suite")
 }
diff --git a/pkg/manager/manager_suite_test.go b/pkg/manager/manager_suite_test.go
@@ -31,11 +31,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
 
-const suiteName = "Manager Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Manager Suite")
 }
 
 var testenv *envtest.Environment

diff --git a/pkg/manager/signals/signals_suite_test.go b/pkg/manager/signals/signals_suite_test.go
@@ -24,11 +24,9 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Runtime Signal Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Runtime Signal Suite")
 }
 
 var _ = BeforeSuite(func() {

diff --git a/pkg/predicate/predicate_suite_test.go b/pkg/predicate/predicate_suite_test.go
@@ -25,11 +25,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Predicate Suite"
-
 func TestPredicate(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Predicate Suite")
 }
 
 var _ = BeforeSuite(func() {

diff --git a/pkg/reconcile/reconcile_suite_test.go b/pkg/reconcile/reconcile_suite_test.go
@@ -25,11 +25,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Reconcile Suite"
-
 func TestReconcile(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Reconcile Suite")
 }
 
 var _ = BeforeSuite(func() {

diff --git a/pkg/runtime/inject/inject_suite_test.go b/pkg/runtime/inject/inject_suite_test.go
@@ -23,9 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Runtime Injection Suite"
-
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Runtime Injection Suite")
 }
diff --git a/pkg/scheme/scheme_suite_test.go b/pkg/scheme/scheme_suite_test.go
@@ -23,9 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const suiteName = "Scheme Suite"
-
 func TestScheme(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Scheme Suite")
 }
diff --git a/pkg/source/internal/internal_suite_test.go b/pkg/source/internal/internal_suite_test.go
@@ -25,11 +25,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
-const suiteName = "Source Internal Suite"
-
 func TestInternal(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, suiteName)
+	RunSpecs(t, "Source Internal Suite")
 }
 
 var _ = BeforeSuite(func() {