fix(lint): changes test pkg name

maistra · Oct 5, 2023 · 5632608 · 5632608
1 parent 311eb36
commit 5632608
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/controllers/dscinitialization/dscinitialization_test.go b/controllers/dscinitialization/dscinitialization_test.go
@@ -5,7 +5,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	dsci "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
-	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtest_util"
+	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtestutil"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
@@ -27,7 +27,7 @@ var _ = Describe("DataScienceCluster initialization", func() {
 		var applicationName string
 		BeforeEach(func() {
 			// when
-			applicationName = envtest_util.AppendRandomNameTo("default-test")
+			applicationName = envtestutil.AppendRandomNameTo("default-test")
 			desiredDsci := createDSCI(applicationName)
 			Expect(k8sClient.Create(context.Background(), desiredDsci)).Should(Succeed())
 			foundDsci := &dsci.DSCInitialization{}
@@ -96,7 +96,7 @@ var _ = Describe("DataScienceCluster initialization", func() {
 		AfterEach(cleanupResources)
 
 		It("Should not update rolebinding if it exists", func() {
-			applicationName := envtest_util.AppendRandomNameTo("rolebinding-test")
+			applicationName := envtestutil.AppendRandomNameTo("rolebinding-test")
 
 			// given
 			desiredRoleBinding := &authv1.RoleBinding{
@@ -133,7 +133,7 @@ var _ = Describe("DataScienceCluster initialization", func() {
 		})
 
 		It("Should not update configmap if it exists", func() {
-			applicationName := envtest_util.AppendRandomNameTo("configmap-test")
+			applicationName := envtestutil.AppendRandomNameTo("configmap-test")
 
 			// given
 			desiredConfigMap := &corev1.ConfigMap{
@@ -166,7 +166,7 @@ var _ = Describe("DataScienceCluster initialization", func() {
 		})
 
 		It("Should not update namespace if it exists", func() {
-			applicationName := envtest_util.AppendRandomNameTo("configmap-test")
+			applicationName := envtestutil.AppendRandomNameTo("configmap-test")
 			anotherNamespace := "test-another-ns"
 
 			// given

diff --git a/controllers/dscinitialization/suite_test.go b/controllers/dscinitialization/suite_test.go
@@ -18,7 +18,7 @@ package dscinitialization_test
 
 import (
 	"context"
-	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtest_util"
+	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtestutil"
 	"k8s.io/apimachinery/pkg/runtime"
 	"path/filepath"
 	"testing"
@@ -76,7 +76,7 @@ var _ = BeforeSuite(func() {
 	ctx, cancel = context.WithCancel(context.TODO())
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 	By("bootstrapping test environment")
-	rootPath, pathErr := envtest_util.FindProjectRoot()
+	rootPath, pathErr := envtestutil.FindProjectRoot()
 	Expect(pathErr).ToNot(HaveOccurred(), pathErr)
 
 	testEnv = &envtest.Environment{

diff --git a/tests/envtest_util/cleaner.go → tests/envtestutil/cleaner.go b/tests/envtest_util/cleaner.go → tests/envtestutil/cleaner.go
@@ -1,4 +1,4 @@
-package envtest_util
+package envtestutil
 
 import (
 	"context"

diff --git a/tests/envtest_util/name_gen.go → tests/envtestutil/name_gen.go b/tests/envtest_util/name_gen.go → tests/envtestutil/name_gen.go
@@ -1,4 +1,4 @@
-package envtest_util
+package envtestutil
 
 import (
 	"crypto/rand"

diff --git a/tests/envtest_util/utils.go → tests/envtestutil/utils.go b/tests/envtest_util/utils.go → tests/envtestutil/utils.go
@@ -1,4 +1,4 @@
-package envtest_util
+package envtestutil
 
 import (
 	"fmt"

diff --git a/tests/integration/servicemesh/service_mesh_setup_features_int_test.go b/tests/integration/servicemesh/service_mesh_setup_features_int_test.go
@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/gomega"
 	dscv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/servicemesh/feature"
-	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtest_util"
+	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtestutil"
 	"io"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -32,16 +32,16 @@ var _ = Describe("preconditions", func() {
 	Context("namespace existence", func() {
 
 		var (
-			objectCleaner *envtest_util.Cleaner
+			objectCleaner *envtestutil.Cleaner
 			testFeature   *feature.Feature
 			namespace     string
 		)
 
 		BeforeEach(func() {
-			objectCleaner = envtest_util.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
+			objectCleaner = envtestutil.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
 
 			testFeatureName := "test-ns-creation"
-			namespace = envtest_util.AppendRandomNameTo(testFeatureName)
+			namespace = envtestutil.AppendRandomNameTo(testFeatureName)
 
 			dsciSpec := newDSCInitializationSpec(namespace)
 			var err error
@@ -135,7 +135,7 @@ var _ = Describe("preconditions", func() {
 var _ = Describe("Ensuring service mesh is set up correctly", func() {
 
 	var (
-		objectCleaner    *envtest_util.Cleaner
+		objectCleaner    *envtestutil.Cleaner
 		dsciSpec         *dscv1.DSCInitializationSpec
 		serviceMeshSpec  *dscv1.ServiceMeshSpec
 		serviceMeshCheck *feature.Feature
@@ -158,7 +158,7 @@ var _ = Describe("Ensuring service mesh is set up correctly", func() {
 
 		Expect(err).ToNot(HaveOccurred())
 
-		objectCleaner = envtest_util.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
+		objectCleaner = envtestutil.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
 	})
 
 	It("should find installed Service Mesh Control Plane", func() {
@@ -184,13 +184,13 @@ var _ = Describe("Ensuring service mesh is set up correctly", func() {
 var _ = Describe("Data Science Project Migration", func() {
 
 	var (
-		objectCleaner    *envtest_util.Cleaner
+		objectCleaner    *envtestutil.Cleaner
 		dsciSpec         *dscv1.DSCInitializationSpec
 		migrationFeature *feature.Feature
 	)
 
 	BeforeEach(func() {
-		objectCleaner = envtest_util.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
+		objectCleaner = envtestutil.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
 
 		dsciSpec = newDSCInitializationSpec("default")
 
@@ -268,15 +268,15 @@ var _ = Describe("Cleanup operations", func() {
 	Context("configuring control plane for auth(z)", func() {
 
 		var (
-			objectCleaner   *envtest_util.Cleaner
+			objectCleaner   *envtestutil.Cleaner
 			dsciSpec        *dscv1.DSCInitializationSpec
 			serviceMeshSpec *dscv1.ServiceMeshSpec
 			namespace       = "test"
 			name            = "minimal"
 		)
 
 		BeforeEach(func() {
-			objectCleaner = envtest_util.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
+			objectCleaner = envtestutil.CreateCleaner(envTestClient, envTest.Config, timeout, interval)
 
 			dsciSpec = newDSCInitializationSpec(namespace)
 
@@ -500,10 +500,10 @@ func getNamespace(namespace string) (*v1.Namespace, error) {
 }
 
 func fromTestTmpDir(fileName string) string {
-	root, err := envtest_util.FindProjectRoot()
+	root, err := envtestutil.FindProjectRoot()
 	Expect(err).ToNot(HaveOccurred())
 
-	tmpDir := filepath.Join(os.TempDir(), envtest_util.RandomUUIDName(16))
+	tmpDir := filepath.Join(os.TempDir(), envtestutil.RandomUUIDName(16))
 	if err := os.Mkdir(tmpDir, os.ModePerm); err != nil {
 		Fail(err.Error())
 	}

diff --git a/tests/integration/servicemesh/service_mesh_suite_int_test.go b/tests/integration/servicemesh/service_mesh_suite_int_test.go
@@ -3,7 +3,7 @@ package servicemesh_test
 import (
 	"context"
 	"fmt"
-	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtest_util"
+	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtestutil"
 	v1 "k8s.io/api/core/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"math/rand"
@@ -44,7 +44,7 @@ var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseFlagOptions(&opts)))
 
 	By("Bootstrapping k8s test environment")
-	projectDir, err := envtest_util.FindProjectRoot()
+	projectDir, err := envtestutil.FindProjectRoot()
 	if err != nil {
 		fmt.Printf("Error finding project root: %v\n", err)
 		return