From 06c8e463504e914a374efe236bb9549a5e3f7add Mon Sep 17 00:00:00 2001 From: shsun_pure Date: Mon, 29 Jul 2024 19:48:07 +0000 Subject: [PATCH] fix test --- test/integration_test/basic_test.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/integration_test/basic_test.go b/test/integration_test/basic_test.go index 234600b3f..f5620e698 100644 --- a/test/integration_test/basic_test.go +++ b/test/integration_test/basic_test.go @@ -475,30 +475,31 @@ func BasicInstallWithPxSaTokenRefresh(tc *types.TestCase) func(*testing.T) { cluster, ok := testSpec.(*corev1.StorageCluster) require.True(t, ok) + verifyTokenRefreshed := func(oldToken string) string { + pxSaSecret, err := coreops.Instance().GetSecret(pxutil.PortworxServiceAccountTokenSecretName, cluster.Namespace) + require.NoError(t, err) + newToken := string(pxSaSecret.Data[core.ServiceAccountTokenKey]) + require.Eventually(t, func() bool { + return oldToken != newToken + }, 10*time.Minute, 15*time.Second, "the token did not get refreshed") + return newToken + } + cluster = ci_utils.DeployAndValidateStorageCluster(cluster, ci_utils.PxSpecImages, t) pxSaSecret, err := coreops.Instance().GetSecret(pxutil.PortworxServiceAccountTokenSecretName, cluster.Namespace) require.NoError(t, err) startupToken := string(pxSaSecret.Data[core.ServiceAccountTokenKey]) 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.Eventually(t, func() bool { - return startupToken != refreshedToken - }, 10*time.Minute, 15*time.Second, "the token did not get refreshed") + + refreshedToken := verifyTokenRefreshed(startupToken) 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(2 * time.Minute) - pxSaSecret, err = coreops.Instance().GetSecret(pxutil.PortworxServiceAccountTokenSecretName, cluster.Namespace) - require.NoError(t, err) - recreatedToken := string(pxSaSecret.Data[core.ServiceAccountTokenKey]) - require.Eventually(t, func() bool { - return refreshedToken != recreatedToken - }, 10*time.Minute, 15*time.Second, "the token did not get refreshed") + + verifyTokenRefreshed(refreshedToken) err = testutil.ValidateStorageCluster(ci_utils.PxSpecImages, cluster, ci_utils.DefaultValidateDeployTimeout, ci_utils.DefaultValidateDeployRetryInterval, true, "") // Delete and validate the deletion