From cd5523f5fb3792bdd060deb0b8ead378c23ad1bf Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Mon, 28 Apr 2025 15:05:31 +0200 Subject: [PATCH] MM-29092 Fix error handling in auto_environment.go (#30610) Co-authored-by: Claude Co-authored-by: Caleb Roseland --- server/.golangci.yml | 1 - server/channels/app/slashcommands/auto_environment.go | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index d41970876b..e70d701f5f 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -100,7 +100,6 @@ issues: channels/app/platform/status.go|\ channels/app/platform/web_hub_test.go|\ channels/app/post_test.go|\ - channels/app/slashcommands/auto_environment.go|\ channels/app/slashcommands/command_test.go|\ channels/app/slashcommands/helper_test.go|\ channels/app/team.go|\ diff --git a/server/channels/app/slashcommands/auto_environment.go b/server/channels/app/slashcommands/auto_environment.go index 664537e0f4..aa035f7f4f 100644 --- a/server/channels/app/slashcommands/auto_environment.go +++ b/server/channels/app/slashcommands/auto_environment.go @@ -38,7 +38,10 @@ func CreateTestEnvironmentWithTeams(a *app.App, c request.CTX, client *model.Cli if err != nil { return TestEnvironment{}, err } - client.LoginById(context.Background(), randomUser.Id, UserPassword) + _, _, err = client.LoginById(context.Background(), randomUser.Id, UserPassword) + if err != nil { + return TestEnvironment{}, err + } teamEnvironment, err := CreateTestEnvironmentInTeam(a, c, client, team, rangeChannels, rangeUsers, rangePosts, fuzzy) if err != nil { return TestEnvironment{}, err @@ -61,7 +64,7 @@ func CreateTestEnvironmentInTeam(a *app.App, c request.CTX, client *model.Client userCreator.Fuzzy = fuzzy users, err := userCreator.CreateTestUsers(c, rangeUsers) if err != nil { - return TeamEnvironment{}, nil + return TeamEnvironment{}, err } usernames := make([]string, len(users)) for i, user := range users { @@ -72,7 +75,7 @@ func CreateTestEnvironmentInTeam(a *app.App, c request.CTX, client *model.Client channelCreator.Fuzzy = fuzzy channels, err := channelCreator.CreateTestChannels(c, rangeChannels) if err != nil { - return TeamEnvironment{}, nil + return TeamEnvironment{}, err } // Have every user join every channel