From f3529e46ed910d054a2f80eab0083e5641d95caa Mon Sep 17 00:00:00 2001 From: Tomasz Smelcerz Date: Mon, 13 Jan 2025 15:36:02 +0100 Subject: [PATCH] refactor pkg/testutils package --- tests/e2e/ca_certificate_rotation_test.go | 1 + {pkg/testutils => tests/e2e/commontestutils}/deployment.go | 5 +++-- {pkg/testutils => tests/e2e/commontestutils}/logs.go | 2 +- {pkg/testutils => tests/e2e/commontestutils}/metrics.go | 2 +- {pkg/testutils => tests/e2e/commontestutils}/rbac.go | 2 +- {pkg/testutils => tests/e2e/commontestutils}/statefulset.go | 5 +++-- {pkg/testutils => tests/e2e/commontestutils}/watcher.go | 2 +- tests/e2e/istio_gateway_secret_rotation_test.go | 1 + tests/e2e/kyma_metrics_test.go | 1 + tests/e2e/labelling_test.go | 1 + tests/e2e/mandatory_module_test.go | 1 + tests/e2e/mandatory_module_with_old_naming_pattern_test.go | 1 + tests/e2e/mandatory_modules_metrics_test.go | 1 + ...mandatory_modules_with_old_naming_pattern_metrics_test.go | 1 + tests/e2e/manifest_reconciliation_test.go | 1 + tests/e2e/module_consistency_test.go | 1 + tests/e2e/module_deletion_test.go | 1 + tests/e2e/module_deletion_upgrade_test.go | 1 + tests/e2e/module_install_by_version_test.go | 1 + tests/e2e/module_status_decoupling_test.go | 1 + tests/e2e/module_upgrade_channel_switch_test.go | 1 + tests/e2e/module_upgrade_new_version_test.go | 1 + tests/e2e/modulereleasemeta_module_deletion_upgrade_test.go | 1 + .../e2e/modulereleasemeta_module_upgrade_new_version_test.go | 1 + tests/e2e/ocm_compatible_module_template_test.go | 1 + tests/e2e/purge_metrics_test.go | 1 + tests/e2e/rbac_privileges_test.go | 2 +- tests/e2e/self_signed_certificate_rotation_test.go | 1 + tests/e2e/utils_test.go | 1 + tests/e2e/watcher_test.go | 1 + .../commontestutils}/skrcontextimpl/dual_cluster.go | 0 .../commontestutils}/skrcontextimpl/single_cluster.go | 0 tests/integration/controller/eventfilters/suite_test.go | 2 +- tests/integration/controller/kcp/suite_test.go | 2 +- tests/integration/controller/kyma/suite_test.go | 2 +- tests/integration/controller/purge/suite_test.go | 2 +- tests/integration/controller/withwatcher/suite_test.go | 2 +- 37 files changed, 39 insertions(+), 14 deletions(-) rename {pkg/testutils => tests/e2e/commontestutils}/deployment.go (94%) rename {pkg/testutils => tests/e2e/commontestutils}/logs.go (98%) rename {pkg/testutils => tests/e2e/commontestutils}/metrics.go (99%) rename {pkg/testutils => tests/e2e/commontestutils}/rbac.go (99%) rename {pkg/testutils => tests/e2e/commontestutils}/statefulset.go (89%) rename {pkg/testutils => tests/e2e/commontestutils}/watcher.go (99%) rename {pkg/testutils => tests/integration/commontestutils}/skrcontextimpl/dual_cluster.go (100%) rename {pkg/testutils => tests/integration/commontestutils}/skrcontextimpl/single_cluster.go (100%) diff --git a/tests/e2e/ca_certificate_rotation_test.go b/tests/e2e/ca_certificate_rotation_test.go index a7b88df960..9b18d93eaa 100644 --- a/tests/e2e/ca_certificate_rotation_test.go +++ b/tests/e2e/ca_certificate_rotation_test.go @@ -13,6 +13,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("CA Certificate Rotation", Ordered, func() { diff --git a/pkg/testutils/deployment.go b/tests/e2e/commontestutils/deployment.go similarity index 94% rename from pkg/testutils/deployment.go rename to tests/e2e/commontestutils/deployment.go index 4cd691ab0c..4cf8ef0f5e 100644 --- a/pkg/testutils/deployment.go +++ b/tests/e2e/commontestutils/deployment.go @@ -1,4 +1,4 @@ -package testutils +package commontestutils import ( "context" @@ -8,6 +8,7 @@ import ( apiappsv1 "k8s.io/api/apps/v1" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/kyma-project/lifecycle-manager/pkg/testutils" "github.com/kyma-project/lifecycle-manager/pkg/util" ) @@ -20,7 +21,7 @@ func DeploymentIsReady(ctx context.Context, clnt client.Client, name, namespace deploy, err := GetDeployment(ctx, clnt, name, namespace) if err != nil { if util.IsNotFound(err) { - return ErrNotFound + return testutils.ErrNotFound } return fmt.Errorf("could not get deployment: %w", err) } diff --git a/pkg/testutils/logs.go b/tests/e2e/commontestutils/logs.go similarity index 98% rename from pkg/testutils/logs.go rename to tests/e2e/commontestutils/logs.go index 9f48462bef..e7ec2289bc 100644 --- a/pkg/testutils/logs.go +++ b/tests/e2e/commontestutils/logs.go @@ -1,4 +1,4 @@ -package testutils +package commontestutils import ( "bytes" diff --git a/pkg/testutils/metrics.go b/tests/e2e/commontestutils/metrics.go similarity index 99% rename from pkg/testutils/metrics.go rename to tests/e2e/commontestutils/metrics.go index 8cea4aa988..3e32a1afc4 100644 --- a/pkg/testutils/metrics.go +++ b/tests/e2e/commontestutils/metrics.go @@ -1,4 +1,4 @@ -package testutils +package commontestutils import ( "context" diff --git a/pkg/testutils/rbac.go b/tests/e2e/commontestutils/rbac.go similarity index 99% rename from pkg/testutils/rbac.go rename to tests/e2e/commontestutils/rbac.go index be14a05082..2cec1f78d4 100644 --- a/pkg/testutils/rbac.go +++ b/tests/e2e/commontestutils/rbac.go @@ -1,4 +1,4 @@ -package testutils +package commontestutils import ( "context" diff --git a/pkg/testutils/statefulset.go b/tests/e2e/commontestutils/statefulset.go similarity index 89% rename from pkg/testutils/statefulset.go rename to tests/e2e/commontestutils/statefulset.go index 0402423a99..7ddcf5fe7a 100644 --- a/pkg/testutils/statefulset.go +++ b/tests/e2e/commontestutils/statefulset.go @@ -1,4 +1,4 @@ -package testutils +package commontestutils import ( "context" @@ -8,6 +8,7 @@ import ( apiappsv1 "k8s.io/api/apps/v1" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/kyma-project/lifecycle-manager/pkg/testutils" "github.com/kyma-project/lifecycle-manager/pkg/util" ) @@ -17,7 +18,7 @@ func StatefulSetIsReady(ctx context.Context, clnt client.Client, name, namespace statefulSet, err := GetStatefulSet(ctx, clnt, name, namespace) if err != nil { if util.IsNotFound(err) { - return ErrNotFound + return testutils.ErrNotFound } return fmt.Errorf("could not get statefulset: %w", err) } diff --git a/pkg/testutils/watcher.go b/tests/e2e/commontestutils/watcher.go similarity index 99% rename from pkg/testutils/watcher.go rename to tests/e2e/commontestutils/watcher.go index deea4eff61..61042c9333 100644 --- a/pkg/testutils/watcher.go +++ b/tests/e2e/commontestutils/watcher.go @@ -1,4 +1,4 @@ -package testutils +package commontestutils import ( "bytes" diff --git a/tests/e2e/istio_gateway_secret_rotation_test.go b/tests/e2e/istio_gateway_secret_rotation_test.go index 7a62a92381..b979553003 100644 --- a/tests/e2e/istio_gateway_secret_rotation_test.go +++ b/tests/e2e/istio_gateway_secret_rotation_test.go @@ -7,6 +7,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/tests/e2e/kyma_metrics_test.go b/tests/e2e/kyma_metrics_test.go index cd3d79f0eb..7055583ce9 100644 --- a/tests/e2e/kyma_metrics_test.go +++ b/tests/e2e/kyma_metrics_test.go @@ -12,6 +12,7 @@ import ( "github.com/kyma-project/lifecycle-manager/pkg/queue" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Manage Module Metrics", Ordered, func() { diff --git a/tests/e2e/labelling_test.go b/tests/e2e/labelling_test.go index d77632f735..642a9bbfc5 100644 --- a/tests/e2e/labelling_test.go +++ b/tests/e2e/labelling_test.go @@ -11,6 +11,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/tests/e2e/mandatory_module_test.go b/tests/e2e/mandatory_module_test.go index af03f8e8b8..038497e0ba 100644 --- a/tests/e2e/mandatory_module_test.go +++ b/tests/e2e/mandatory_module_test.go @@ -9,6 +9,7 @@ import ( apimetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/tests/e2e/mandatory_module_with_old_naming_pattern_test.go b/tests/e2e/mandatory_module_with_old_naming_pattern_test.go index 12366a2e47..24b456cbc7 100644 --- a/tests/e2e/mandatory_module_with_old_naming_pattern_test.go +++ b/tests/e2e/mandatory_module_with_old_naming_pattern_test.go @@ -9,6 +9,7 @@ import ( apimetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/tests/e2e/mandatory_modules_metrics_test.go b/tests/e2e/mandatory_modules_metrics_test.go index 37c12cab3f..9402b82162 100644 --- a/tests/e2e/mandatory_modules_metrics_test.go +++ b/tests/e2e/mandatory_modules_metrics_test.go @@ -11,6 +11,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Mandatory Module Metrics", Ordered, func() { diff --git a/tests/e2e/mandatory_modules_with_old_naming_pattern_metrics_test.go b/tests/e2e/mandatory_modules_with_old_naming_pattern_metrics_test.go index 17d3b881b5..7f9f202e79 100644 --- a/tests/e2e/mandatory_modules_with_old_naming_pattern_metrics_test.go +++ b/tests/e2e/mandatory_modules_with_old_naming_pattern_metrics_test.go @@ -11,6 +11,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Mandatory Module With Old Naming Pattern Metrics", Ordered, func() { diff --git a/tests/e2e/manifest_reconciliation_test.go b/tests/e2e/manifest_reconciliation_test.go index 2154c6f5b4..0777431669 100644 --- a/tests/e2e/manifest_reconciliation_test.go +++ b/tests/e2e/manifest_reconciliation_test.go @@ -9,6 +9,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Manifest Skip Reconciliation Label", Ordered, func() { diff --git a/tests/e2e/module_consistency_test.go b/tests/e2e/module_consistency_test.go index 24c31c6d66..f47af698c2 100644 --- a/tests/e2e/module_consistency_test.go +++ b/tests/e2e/module_consistency_test.go @@ -11,6 +11,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Module Keep Consistent After Deploy", Ordered, func() { diff --git a/tests/e2e/module_deletion_test.go b/tests/e2e/module_deletion_test.go index c5536071aa..663b1ebab9 100644 --- a/tests/e2e/module_deletion_test.go +++ b/tests/e2e/module_deletion_test.go @@ -10,6 +10,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Non Blocking Kyma Module Deletion", Ordered, func() { diff --git a/tests/e2e/module_deletion_upgrade_test.go b/tests/e2e/module_deletion_upgrade_test.go index b897ce241e..563dc0fad4 100644 --- a/tests/e2e/module_deletion_upgrade_test.go +++ b/tests/e2e/module_deletion_upgrade_test.go @@ -12,6 +12,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Kyma Module Upgrade Under Deletion", Ordered, func() { diff --git a/tests/e2e/module_install_by_version_test.go b/tests/e2e/module_install_by_version_test.go index 861310ec47..1974463d14 100644 --- a/tests/e2e/module_install_by_version_test.go +++ b/tests/e2e/module_install_by_version_test.go @@ -8,6 +8,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" "github.com/kyma-project/lifecycle-manager/pkg/testutils/builder" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Module Install By Version", Ordered, func() { diff --git a/tests/e2e/module_status_decoupling_test.go b/tests/e2e/module_status_decoupling_test.go index dce94ac688..ca43643628 100644 --- a/tests/e2e/module_status_decoupling_test.go +++ b/tests/e2e/module_status_decoupling_test.go @@ -16,6 +16,7 @@ import ( templatev1alpha1 "github.com/kyma-project/template-operator/api/v1alpha1" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) type ResourceKind string diff --git a/tests/e2e/module_upgrade_channel_switch_test.go b/tests/e2e/module_upgrade_channel_switch_test.go index 35e32e7d99..eeaec78526 100644 --- a/tests/e2e/module_upgrade_channel_switch_test.go +++ b/tests/e2e/module_upgrade_channel_switch_test.go @@ -7,6 +7,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/shared" "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Module Upgrade By Channel Switch", Ordered, func() { diff --git a/tests/e2e/module_upgrade_new_version_test.go b/tests/e2e/module_upgrade_new_version_test.go index 61b48f943e..525ae06263 100644 --- a/tests/e2e/module_upgrade_new_version_test.go +++ b/tests/e2e/module_upgrade_new_version_test.go @@ -7,6 +7,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/shared" "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Module Upgrade By New Version", Ordered, func() { diff --git a/tests/e2e/modulereleasemeta_module_deletion_upgrade_test.go b/tests/e2e/modulereleasemeta_module_deletion_upgrade_test.go index 3cb115284d..da2bc7ca8f 100644 --- a/tests/e2e/modulereleasemeta_module_deletion_upgrade_test.go +++ b/tests/e2e/modulereleasemeta_module_deletion_upgrade_test.go @@ -10,6 +10,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Kyma Module with ModuleReleaseMeta Upgrade Under Deletion", Ordered, func() { diff --git a/tests/e2e/modulereleasemeta_module_upgrade_new_version_test.go b/tests/e2e/modulereleasemeta_module_upgrade_new_version_test.go index ce18d2be91..fc81f3f0a0 100644 --- a/tests/e2e/modulereleasemeta_module_upgrade_new_version_test.go +++ b/tests/e2e/modulereleasemeta_module_upgrade_new_version_test.go @@ -7,6 +7,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/shared" "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Module with ModuleReleaseMeta Upgrade By New Version", Ordered, func() { diff --git a/tests/e2e/ocm_compatible_module_template_test.go b/tests/e2e/ocm_compatible_module_template_test.go index 9d4385b2a3..4a6376294a 100644 --- a/tests/e2e/ocm_compatible_module_template_test.go +++ b/tests/e2e/ocm_compatible_module_template_test.go @@ -7,6 +7,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/shared" "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("OCM Format Module Template", Ordered, func() { diff --git a/tests/e2e/purge_metrics_test.go b/tests/e2e/purge_metrics_test.go index cba1e35af1..d2a3fcba87 100644 --- a/tests/e2e/purge_metrics_test.go +++ b/tests/e2e/purge_metrics_test.go @@ -9,6 +9,7 @@ import ( "github.com/kyma-project/lifecycle-manager/api/v1beta2" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Purge Metrics", Ordered, func() { diff --git a/tests/e2e/rbac_privileges_test.go b/tests/e2e/rbac_privileges_test.go index 0eb7b51b31..1014f0fe90 100644 --- a/tests/e2e/rbac_privileges_test.go +++ b/tests/e2e/rbac_privileges_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("RBAC Privileges", func() { diff --git a/tests/e2e/self_signed_certificate_rotation_test.go b/tests/e2e/self_signed_certificate_rotation_test.go index 2f986f3893..ed73540567 100644 --- a/tests/e2e/self_signed_certificate_rotation_test.go +++ b/tests/e2e/self_signed_certificate_rotation_test.go @@ -12,6 +12,7 @@ import ( "github.com/kyma-project/lifecycle-manager/internal/pkg/metrics" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" "github.com/kyma-project/lifecycle-manager/pkg/watcher" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var _ = Describe("Self Signed Certificate Rotation", Ordered, func() { diff --git a/tests/e2e/utils_test.go b/tests/e2e/utils_test.go index 8e414a01bb..f4ab14eae8 100644 --- a/tests/e2e/utils_test.go +++ b/tests/e2e/utils_test.go @@ -23,6 +23,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) var ( diff --git a/tests/e2e/watcher_test.go b/tests/e2e/watcher_test.go index 3a77d2251f..c00cf7cf5a 100644 --- a/tests/e2e/watcher_test.go +++ b/tests/e2e/watcher_test.go @@ -20,6 +20,7 @@ import ( . "github.com/onsi/gomega" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" + . "github.com/kyma-project/lifecycle-manager/tests/e2e/commontestutils" ) const ( diff --git a/pkg/testutils/skrcontextimpl/dual_cluster.go b/tests/integration/commontestutils/skrcontextimpl/dual_cluster.go similarity index 100% rename from pkg/testutils/skrcontextimpl/dual_cluster.go rename to tests/integration/commontestutils/skrcontextimpl/dual_cluster.go diff --git a/pkg/testutils/skrcontextimpl/single_cluster.go b/tests/integration/commontestutils/skrcontextimpl/single_cluster.go similarity index 100% rename from pkg/testutils/skrcontextimpl/single_cluster.go rename to tests/integration/commontestutils/skrcontextimpl/single_cluster.go diff --git a/tests/integration/controller/eventfilters/suite_test.go b/tests/integration/controller/eventfilters/suite_test.go index f10bc4fa3a..af168dc8b4 100644 --- a/tests/integration/controller/eventfilters/suite_test.go +++ b/tests/integration/controller/eventfilters/suite_test.go @@ -47,8 +47,8 @@ import ( "github.com/kyma-project/lifecycle-manager/internal/remote" "github.com/kyma-project/lifecycle-manager/pkg/log" "github.com/kyma-project/lifecycle-manager/pkg/queue" - testskrcontext "github.com/kyma-project/lifecycle-manager/pkg/testutils/skrcontextimpl" "github.com/kyma-project/lifecycle-manager/tests/integration" + testskrcontext "github.com/kyma-project/lifecycle-manager/tests/integration/commontestutils/skrcontextimpl" _ "ocm.software/ocm/api/ocm" diff --git a/tests/integration/controller/kcp/suite_test.go b/tests/integration/controller/kcp/suite_test.go index 4a39a1b14e..d4f1b6166e 100644 --- a/tests/integration/controller/kcp/suite_test.go +++ b/tests/integration/controller/kcp/suite_test.go @@ -48,8 +48,8 @@ import ( "github.com/kyma-project/lifecycle-manager/pkg/log" "github.com/kyma-project/lifecycle-manager/pkg/queue" . "github.com/kyma-project/lifecycle-manager/pkg/testutils" - testskrcontext "github.com/kyma-project/lifecycle-manager/pkg/testutils/skrcontextimpl" "github.com/kyma-project/lifecycle-manager/tests/integration" + testskrcontext "github.com/kyma-project/lifecycle-manager/tests/integration/commontestutils/skrcontextimpl" _ "ocm.software/ocm/api/ocm" diff --git a/tests/integration/controller/kyma/suite_test.go b/tests/integration/controller/kyma/suite_test.go index cbcf1910ab..58e4b50ee4 100644 --- a/tests/integration/controller/kyma/suite_test.go +++ b/tests/integration/controller/kyma/suite_test.go @@ -46,8 +46,8 @@ import ( "github.com/kyma-project/lifecycle-manager/internal/remote" "github.com/kyma-project/lifecycle-manager/pkg/log" "github.com/kyma-project/lifecycle-manager/pkg/queue" - testskrcontext "github.com/kyma-project/lifecycle-manager/pkg/testutils/skrcontextimpl" "github.com/kyma-project/lifecycle-manager/tests/integration" + testskrcontext "github.com/kyma-project/lifecycle-manager/tests/integration/commontestutils/skrcontextimpl" _ "ocm.software/ocm/api/ocm" diff --git a/tests/integration/controller/purge/suite_test.go b/tests/integration/controller/purge/suite_test.go index ed7629c222..f028acd694 100644 --- a/tests/integration/controller/purge/suite_test.go +++ b/tests/integration/controller/purge/suite_test.go @@ -40,8 +40,8 @@ import ( "github.com/kyma-project/lifecycle-manager/internal/pkg/metrics" "github.com/kyma-project/lifecycle-manager/pkg/log" "github.com/kyma-project/lifecycle-manager/pkg/matcher" - testskrcontext "github.com/kyma-project/lifecycle-manager/pkg/testutils/skrcontextimpl" "github.com/kyma-project/lifecycle-manager/tests/integration" + testskrcontext "github.com/kyma-project/lifecycle-manager/tests/integration/commontestutils/skrcontextimpl" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/tests/integration/controller/withwatcher/suite_test.go b/tests/integration/controller/withwatcher/suite_test.go index a0ec28e267..106ba54779 100644 --- a/tests/integration/controller/withwatcher/suite_test.go +++ b/tests/integration/controller/withwatcher/suite_test.go @@ -53,9 +53,9 @@ import ( "github.com/kyma-project/lifecycle-manager/internal/remote" "github.com/kyma-project/lifecycle-manager/pkg/log" "github.com/kyma-project/lifecycle-manager/pkg/queue" - testskrcontext "github.com/kyma-project/lifecycle-manager/pkg/testutils/skrcontextimpl" "github.com/kyma-project/lifecycle-manager/pkg/watcher" "github.com/kyma-project/lifecycle-manager/tests/integration" + testskrcontext "github.com/kyma-project/lifecycle-manager/tests/integration/commontestutils/skrcontextimpl" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega"