From 7846ac86b49b29e21357617be9e2059f56131a48 Mon Sep 17 00:00:00 2001
From: Ivy Gesare <83957195+Gesare5@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:11:55 +0300
Subject: [PATCH] [MM-61506] Fix errcheck issues in
 server/channels/app/teams/helper_test.go (#29144)

---
 server/.golangci.yml                     |  1 -
 server/channels/app/teams/helper_test.go | 38 ++++++++++--------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/server/.golangci.yml b/server/.golangci.yml
index dc1e3d23c8..51308a8379 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -159,7 +159,6 @@ issues:
         channels/app/syncables.go|\
         channels/app/team.go|\
         channels/app/team_test.go|\
-        channels/app/teams/helper_test.go|\
         channels/app/upload.go|\
         channels/app/upload_test.go|\
         channels/app/user.go|\
diff --git a/server/channels/app/teams/helper_test.go b/server/channels/app/teams/helper_test.go
index 4de68ca4e7..f653abf088 100644
--- a/server/channels/app/teams/helper_test.go
+++ b/server/channels/app/teams/helper_test.go
@@ -9,6 +9,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/shared/mlog"
 	"github.com/mattermost/mattermost/server/public/shared/request"
@@ -24,6 +26,7 @@ type TestHelper struct {
 
 	Context   *request.Context
 	LogBuffer *bytes.Buffer
+	TB        testing.TB
 }
 
 type mockWebHub struct{}
@@ -44,9 +47,7 @@ func Setup(tb testing.TB) *TestHelper {
 
 func setupTestHelper(s store.Store, includeCacheLayer bool, tb testing.TB) *TestHelper {
 	tempWorkspace, err := os.MkdirTemp("", "teamservicetest")
-	if err != nil {
-		panic(err)
-	}
+	require.NoError(tb, err)
 
 	configStore := config.NewTestMemoryStore()
 
@@ -66,7 +67,8 @@ func setupTestHelper(s store.Store, includeCacheLayer bool, tb testing.TB) *Test
 	*config.PasswordSettings.Uppercase = false
 	*config.PasswordSettings.Symbol = false
 	*config.PasswordSettings.Number = false
-	configStore.Set(config)
+	_, _, err = configStore.Set(config)
+	require.NoError(tb, err)
 
 	buffer := &bytes.Buffer{}
 
@@ -106,38 +108,30 @@ func (th *TestHelper) UpdateConfig(f func(*model.Config)) {
 	old := th.configStore.Get()
 	updated := old.Clone()
 	f(updated)
-	if _, _, err := th.configStore.Set(updated); err != nil {
-		panic(err)
-	}
+	_, _, err := th.configStore.Set(updated)
+	require.NoError(th.TB, err)
 }
 
 func (th *TestHelper) CreateUser(u *model.User) *model.User {
 	u.EmailVerified = true
 	user, err := th.dbStore.User().Save(th.Context, u)
-	if err != nil {
-		panic(err)
-	}
+	require.NoError(th.TB, err)
 
 	return user
 }
 
 func (th *TestHelper) DeleteUser(u *model.User) {
 	err := th.dbStore.User().PermanentDelete(th.Context, u.Id)
-	if err != nil {
-		panic(err)
-	}
+	require.NoError(th.TB, err)
 }
 
 func (th *TestHelper) DeleteTeam(t *model.Team) {
-	if err := th.dbStore.Channel().PermanentDeleteByTeam(t.Id); err != nil {
-		panic(err)
-	}
+	err := th.dbStore.Channel().PermanentDeleteByTeam(t.Id)
+	require.NoError(th.TB, err)
 
-	if err := th.dbStore.Team().RemoveAllMembersByTeam(t.Id); err != nil {
-		panic(err)
-	}
+	err = th.dbStore.Team().RemoveAllMembersByTeam(t.Id)
+	require.NoError(th.TB, err)
 
-	if err := th.dbStore.Team().PermanentDelete(t.Id); err != nil {
-		panic(err)
-	}
+	err = th.dbStore.Team().PermanentDelete(t.Id)
+	require.NoError(th.TB, err)
 }