From cecc959a942fa79828b2194d6c0f926ae5a7af9a Mon Sep 17 00:00:00 2001 From: Michael Li Date: Tue, 25 Apr 2023 09:47:08 -0400 Subject: [PATCH] test(e2e): Clean up user if test fails (#3180) --- .../tests/static/session_end_delete_user_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/testing/internal/e2e/tests/static/session_end_delete_user_test.go b/testing/internal/e2e/tests/static/session_end_delete_user_test.go index e6bd09f49..d5e4a2070 100644 --- a/testing/internal/e2e/tests/static/session_end_delete_user_test.go +++ b/testing/internal/e2e/tests/static/session_end_delete_user_test.go @@ -18,6 +18,8 @@ import ( // TestCliSessionEndWhenUserIsDeleted tests that an active session is canceled when the respective // user who started the session is deleted. func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { + userIsDeleted := false + e2e.MaybeSkipTest(t) c, err := loadConfig() require.NoError(t, err) @@ -50,6 +52,16 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) }) newUserId := boundary.CreateNewUserCli(t, ctx, "global") + t.Cleanup(func() { + if !userIsDeleted { + t.Log("Deleting user...") + boundary.AuthenticateAdminCli(t, context.Background()) + output := e2e.RunCommand(ctx, "boundary", + e2e.WithArgs("users", "delete", "-id", newUserId), + ) + require.NoError(t, output.Err, string(output.Stderr)) + } + }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") @@ -89,6 +101,7 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { t.Log("Deleting user...") output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("users", "delete", "-id", newUserId)) require.NoError(t, output.Err, string(output.Stderr)) + userIsDeleted = true // Check if session has terminated t.Log("Waiting for session to be canceling/terminated...")