From 3258363c5ce742798d7030895ec79ed1df55daff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C4=8Ctvrtka?= <62988319+JiriCtvrtka@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:12:47 +0200 Subject: [PATCH] PMM-7 Fix for service accounts tests stability. (#2976) * PMM-7 Test. * trigger * trigger * trigger * trigger * trigger * trigger * trigger * trigger * trigger * PMM-7 test. * trigger * trigger * trigger * PMM-7 Test if fails are due to locked accounts. * PMM-7 Test not in parallels. * trigger * trigger * trigger * PMM-7 Comment about locks. * trigger --- managed/services/grafana/auth_server_test.go | 1 + managed/services/grafana/client_test.go | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/managed/services/grafana/auth_server_test.go b/managed/services/grafana/auth_server_test.go index 0b1bbbe14c..8b03a2ad2c 100644 --- a/managed/services/grafana/auth_server_test.go +++ b/managed/services/grafana/auth_server_test.go @@ -292,6 +292,7 @@ func TestServerClientConnection(t *testing.T) { assert.Nil(t, authError) }) + // Beware: Five or more wrong tries will lock user with error message: "Invalid user or password". t.Run("Basic auth - fail", func(t *testing.T) { t.Parallel() diff --git a/managed/services/grafana/client_test.go b/managed/services/grafana/client_test.go index 66963ded67..25cb50f3a1 100644 --- a/managed/services/grafana/client_test.go +++ b/managed/services/grafana/client_test.go @@ -41,8 +41,6 @@ func TestClient(t *testing.T) { t.Run("getRole", func(t *testing.T) { t.Run("GrafanaAdmin", func(t *testing.T) { - t.Parallel() - u, err := c.getAuthUser(ctx, authHeaders) role := u.role assert.NoError(t, err) @@ -51,8 +49,6 @@ func TestClient(t *testing.T) { }) t.Run("NoAnonymousAccess", func(t *testing.T) { - t.Parallel() - // See [auth.anonymous] in grafana.ini. // Even if anonymous access is enabled, returned role is None, not org_role. @@ -101,8 +97,6 @@ func TestClient(t *testing.T) { role := role t.Run(fmt.Sprintf("Basic auth %s", role.String()), func(t *testing.T) { - t.Parallel() - login := fmt.Sprintf("basic-%s-%d", role, time.Now().Nanosecond()) userID, err := c.testCreateUser(ctx, login, role, authHeaders) require.NoError(t, err) @@ -127,8 +121,6 @@ func TestClient(t *testing.T) { }) t.Run(fmt.Sprintf("API Key auth %s", role.String()), func(t *testing.T) { - t.Parallel() - login := fmt.Sprintf("api-%s-%d", role, time.Now().Nanosecond()) apiKeyID, apiKey, err := c.createAPIKey(ctx, login, role, authHeaders) require.NoError(t, err) @@ -152,8 +144,6 @@ func TestClient(t *testing.T) { }) t.Run(fmt.Sprintf("Service token auth %s", role.String()), func(t *testing.T) { - t.Parallel() - nodeName := fmt.Sprintf("test-node-%s", role) serviceAccountID, err := c.createServiceAccount(ctx, role, nodeName, true, authHeaders) require.NoError(t, err)