From f402b5e126ee353521caff4d4938c084669b550a Mon Sep 17 00:00:00 2001
From: Xin Ruan <xin.ruan@sap.com>
Date: Thu, 18 Jul 2024 13:04:48 +0200
Subject: [PATCH] fix flaky test

---
 .golangci.yaml                                       | 2 +-
 internal/descriptor/provider/provider_test.go        | 2 +-
 pkg/testutils/kyma.go                                | 5 +++++
 tests/integration/controller/kcp/remote_sync_test.go | 5 +++--
 tests/integration/controller/kcp/suite_test.go       | 3 ---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index d5c184f292..a9d6a735c1 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -190,7 +190,7 @@ issues:
       linters: [ gci ] # Disable gci due to the test utilities dot import.
     - path: tests/integration/declarative/declarative_test.go
       linters: [ gci ] # Disable gci due to the test utilities dot import.
-    - path: tests/integration/controller/(controlplane|eventfilters|kyma|withwatcher|purge|mandatorymodule)/(.*)_test.go
+    - path: tests/integration/controller/(eventfilters|kyma|withwatcher|purge|mandatorymodule|kcp)/(.*)_test.go
       linters: [ gci ] # Disable gci due to the test utilities dot import.
     - linters:
       - importas
diff --git a/internal/descriptor/provider/provider_test.go b/internal/descriptor/provider/provider_test.go
index e4feda9b6a..b526e35bf0 100644
--- a/internal/descriptor/provider/provider_test.go
+++ b/internal/descriptor/provider/provider_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestGetDescriptor_OnEmptySpec_ReturnsErrDecode(t *testing.T) {
-	descriptorProvider := provider.NewCachedDescriptorProvider() // assuming it handles nil cache internally
+	descriptorProvider := provider.NewCachedDescriptorProvider()
 	template := &v1beta2.ModuleTemplate{}
 
 	_, err := descriptorProvider.GetDescriptor(template)
diff --git a/pkg/testutils/kyma.go b/pkg/testutils/kyma.go
index 889de1f954..2a39eb5175 100644
--- a/pkg/testutils/kyma.go
+++ b/pkg/testutils/kyma.go
@@ -139,6 +139,11 @@ func EnableModule(ctx context.Context,
 	if err != nil {
 		return err
 	}
+	for _, enabledModule := range kyma.Spec.Modules {
+		if enabledModule.Name == module.Name {
+			return nil
+		}
+	}
 	kyma.Spec.Modules = append(
 		kyma.Spec.Modules, module)
 	err = clnt.Update(ctx, kyma)
diff --git a/tests/integration/controller/kcp/remote_sync_test.go b/tests/integration/controller/kcp/remote_sync_test.go
index 9fca8e7469..788ac42a85 100644
--- a/tests/integration/controller/kcp/remote_sync_test.go
+++ b/tests/integration/controller/kcp/remote_sync_test.go
@@ -15,9 +15,10 @@ import (
 	"github.com/kyma-project/lifecycle-manager/internal/pkg/flags"
 	"github.com/kyma-project/lifecycle-manager/pkg/testutils/builder"
 
-	. "github.com/kyma-project/lifecycle-manager/pkg/testutils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	. "github.com/kyma-project/lifecycle-manager/pkg/testutils"
 )
 
 var (
@@ -223,7 +224,7 @@ func buildSkrKyma() *v1beta2.Kyma {
 
 func IsDescriptorCached(template *v1beta2.ModuleTemplate) bool {
 	key := cache.GenerateDescriptorKey(template)
-	result := descriptorCache.Get(key)
+	result := descriptorProvider.DescriptorCache.Get(key)
 	return result != nil
 }
 
diff --git a/tests/integration/controller/kcp/suite_test.go b/tests/integration/controller/kcp/suite_test.go
index 5aca996c00..7e1a8d2118 100644
--- a/tests/integration/controller/kcp/suite_test.go
+++ b/tests/integration/controller/kcp/suite_test.go
@@ -40,7 +40,6 @@ import (
 	"github.com/kyma-project/lifecycle-manager/internal"
 	"github.com/kyma-project/lifecycle-manager/internal/controller/kyma"
 	"github.com/kyma-project/lifecycle-manager/internal/crd"
-	"github.com/kyma-project/lifecycle-manager/internal/descriptor/cache"
 	"github.com/kyma-project/lifecycle-manager/internal/descriptor/provider"
 	"github.com/kyma-project/lifecycle-manager/internal/event"
 	"github.com/kyma-project/lifecycle-manager/internal/pkg/flags"
@@ -71,7 +70,6 @@ var (
 	ctx                   context.Context
 	cancel                context.CancelFunc
 	cfg                   *rest.Config
-	descriptorCache       *cache.DescriptorCache
 	descriptorProvider    *provider.CachedDescriptorProvider
 	crdCache              *crd.Cache
 )
@@ -140,7 +138,6 @@ var _ = BeforeSuite(func() {
 
 	testEventRec := event.NewRecorderWrapper(mgr.GetEventRecorderFor(shared.OperatorName))
 	testSkrContextFactory = testskrcontext.NewDualClusterFactory(kcpClient.Scheme(), testEventRec)
-	descriptorCache = cache.NewDescriptorCache()
 	descriptorProvider = provider.NewCachedDescriptorProvider()
 	crdCache = crd.NewCache(nil)
 	err = (&kyma.Reconciler{