From 738672253ec0155b71487eb56a0f45f647723c4e Mon Sep 17 00:00:00 2001 From: shsun_pure Date: Fri, 26 Jul 2024 16:50:24 +0000 Subject: [PATCH] address comments --- test/integration_test/basic_test.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/integration_test/basic_test.go b/test/integration_test/basic_test.go index 698522fb7..234600b3f 100644 --- 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)