address comments

libopenstorage · Jul 26, 2024 · 7386722 · 7386722
1 parent 131d209
commit 7386722
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/test/integration_test/basic_test.go b/test/integration_test/basic_test.go
@@ -480,22 +480,26 @@ func BasicInstallWithPxSaTokenRefresh(tc *types.TestCase) func(*testing.T) {
 		require.NoError(t, err)
 		startupToken := string(pxSaSecret.Data[core.ServiceAccountTokenKey])
 
-		time.Sleep(time.Duration(5) * time.Minute)
-		err = testutil.ValidateStorageCluster(ci_utils.PxSpecImages, cluster, ci_utils.DefaultValidateDeployTimeout, ci_utils.DefaultValidateDeployRetryInterval, true, "")
+		time.Sleep(5 * time.Minute)
 		require.NoError(t, err)
 		pxSaSecret, err = coreops.Instance().GetSecret(pxutil.PortworxServiceAccountTokenSecretName, cluster.Namespace)
 		require.NoError(t, err)
 		refreshedToken := string(pxSaSecret.Data[core.ServiceAccountTokenKey])
-		require.NotEqual(t, startupToken, refreshedToken, "the token did not get refreshed")
+		require.Eventually(t, func() bool {
+			return startupToken != refreshedToken
+		}, 10*time.Minute, 15*time.Second, "the token did not get refreshed")
+		err = testutil.ValidateStorageCluster(ci_utils.PxSpecImages, cluster, ci_utils.DefaultValidateDeployTimeout, ci_utils.DefaultValidateDeployRetryInterval, true, "")
 
 		err = coreops.Instance().DeleteSecret(pxutil.PortworxServiceAccountTokenSecretName, cluster.Namespace)
 		require.NoError(t, err)
-		time.Sleep(time.Duration(2) * time.Minute)
-		err = testutil.ValidateStorageCluster(ci_utils.PxSpecImages, cluster, ci_utils.DefaultValidateDeployTimeout, ci_utils.DefaultValidateDeployRetryInterval, true, "")
+		time.Sleep(2 * time.Minute)
 		pxSaSecret, err = coreops.Instance().GetSecret(pxutil.PortworxServiceAccountTokenSecretName, cluster.Namespace)
 		require.NoError(t, err)
 		recreatedToken := string(pxSaSecret.Data[core.ServiceAccountTokenKey])
-		require.NotEqual(t, refreshedToken, recreatedToken, "the token did not get refreshed")
+		require.Eventually(t, func() bool {
+			return refreshedToken != recreatedToken
+		}, 10*time.Minute, 15*time.Second, "the token did not get refreshed")
+		err = testutil.ValidateStorageCluster(ci_utils.PxSpecImages, cluster, ci_utils.DefaultValidateDeployTimeout, ci_utils.DefaultValidateDeployRetryInterval, true, "")
 
 		// Delete and validate the deletion
 		ci_utils.UninstallAndValidateStorageCluster(cluster, t)