Merge pull request #104 from gianlucam76/prep

Fix expiration time test
projectsveltos · Jul 21, 2023 · 7117b66 · 7117b66
2 parents 07e3eed + 9cd48a2
commit 7117b66
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/controllers/deployer_utils_test.go b/controllers/deployer_utils_test.go
@@ -445,11 +445,17 @@ var _ = Describe("Deployer utils", func() {
 			[]byte(randomString()), &tokenRequest.Status, klogr.New())).To(Succeed())
 
 		// Wait for cache to sync
-		Eventually(func() error {
-			_, err := controllers.GetSecretWithKubeconfig(context.TODO(),
+		Eventually(func() bool {
+			secret, err := controllers.GetSecretWithKubeconfig(context.TODO(),
 				testEnv.Client, roleRequest, clusterNamespace, clusterName, libsveltosv1alpha1.ClusterTypeSveltos, klogr.New())
-			return err
-		}, timeout, pollingInterval).Should(BeNil())
+			if err != nil || secret.Data == nil {
+				return false
+			}
+			// Since Secret is first created and then updated with expirationKey
+			// verify expirationKey is set. Then validate value out of this eventual loop
+			_, ok := secret.Data[controllers.ExpirationKey]
+			return ok
+		}, timeout, pollingInterval).Should(BeTrue())
 
 		// Since expiration time was set in a day, expect result to be false
 		Expect(controllers.IsTimeExpired(context.TODO(), testEnv.Client, roleRequest,

diff --git a/controllers/export_test.go b/controllers/export_test.go
@@ -64,6 +64,10 @@ var (
 	GetSecretWithKubeconfig                  = getSecretWithKubeconfig
 )
 
+const (
+	ExpirationKey = expirationKey
+)
+
 var (
 	DeployRoleRequestInCluster     = deployRoleRequestInCluster
 	UndeployRoleRequestFromCluster = undeployRoleRequestFromCluster