From a059d70ba83b04325b7137f4b5a9dbf245abbee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Smoli=C5=84ski?= Date: Mon, 14 Nov 2022 10:09:33 +0100 Subject: [PATCH] Fix Flaky TestDatabaseRootLeafIdleTimeout test (#18202) --- integration/db/db_integration_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/integration/db/db_integration_test.go b/integration/db/db_integration_test.go index 8f173922b3f..6f03337ef4b 100644 --- a/integration/db/db_integration_test.go +++ b/integration/db/db_integration_test.go @@ -28,6 +28,7 @@ import ( "github.com/gravitational/trace" "github.com/jackc/pgconn" "github.com/jonboulle/clockwork" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.mongodb.org/mongo-driver/bson" @@ -563,6 +564,13 @@ func TestDatabaseRootLeafIdleTimeout(t *testing.T) { t.Run("root role with idle timeout", func(t *testing.T) { setRoleIdleTimeout(t, rootAuthServer, rootRole, idleTimeout) + require.Eventually(t, func() bool { + role, err := rootAuthServer.GetRole(context.Background(), rootRole.GetName()) + assert.NoError(t, err) + return time.Duration(role.GetOptions().ClientIdleTimeout) == idleTimeout + + }, time.Second, time.Millisecond*100, "role idle timeout propagation filed") + client := mkMySQLLeafDBClient(t) _, err := client.Execute("select 1") require.NoError(t, err) @@ -578,6 +586,13 @@ func TestDatabaseRootLeafIdleTimeout(t *testing.T) { t.Run("leaf role with idle timeout", func(t *testing.T) { setRoleIdleTimeout(t, leafAuthServer, leafRole, idleTimeout) + require.Eventually(t, func() bool { + role, err := leafAuthServer.GetRole(context.Background(), leafRole.GetName()) + assert.NoError(t, err) + return time.Duration(role.GetOptions().ClientIdleTimeout) == idleTimeout + + }, time.Second, time.Millisecond*100, "role idle timeout propagation filed") + client := mkMySQLLeafDBClient(t) _, err := client.Execute("select 1") require.NoError(t, err)