[MM-61506] Fix errcheck issues in server/channels/app/teams/helper_test.go (#29144)
Этот коммит содержится в:
@@ -159,7 +159,6 @@ issues:
|
|||||||
channels/app/syncables.go|\
|
channels/app/syncables.go|\
|
||||||
channels/app/team.go|\
|
channels/app/team.go|\
|
||||||
channels/app/team_test.go|\
|
channels/app/team_test.go|\
|
||||||
channels/app/teams/helper_test.go|\
|
|
||||||
channels/app/upload.go|\
|
channels/app/upload.go|\
|
||||||
channels/app/upload_test.go|\
|
channels/app/upload_test.go|\
|
||||||
channels/app/user.go|\
|
channels/app/user.go|\
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/mattermost/mattermost/server/public/model"
|
"github.com/mattermost/mattermost/server/public/model"
|
||||||
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
||||||
"github.com/mattermost/mattermost/server/public/shared/request"
|
"github.com/mattermost/mattermost/server/public/shared/request"
|
||||||
@@ -24,6 +26,7 @@ type TestHelper struct {
|
|||||||
|
|
||||||
Context *request.Context
|
Context *request.Context
|
||||||
LogBuffer *bytes.Buffer
|
LogBuffer *bytes.Buffer
|
||||||
|
TB testing.TB
|
||||||
}
|
}
|
||||||
|
|
||||||
type mockWebHub struct{}
|
type mockWebHub struct{}
|
||||||
@@ -44,9 +47,7 @@ func Setup(tb testing.TB) *TestHelper {
|
|||||||
|
|
||||||
func setupTestHelper(s store.Store, includeCacheLayer bool, tb testing.TB) *TestHelper {
|
func setupTestHelper(s store.Store, includeCacheLayer bool, tb testing.TB) *TestHelper {
|
||||||
tempWorkspace, err := os.MkdirTemp("", "teamservicetest")
|
tempWorkspace, err := os.MkdirTemp("", "teamservicetest")
|
||||||
if err != nil {
|
require.NoError(tb, err)
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
configStore := config.NewTestMemoryStore()
|
configStore := config.NewTestMemoryStore()
|
||||||
|
|
||||||
@@ -66,7 +67,8 @@ func setupTestHelper(s store.Store, includeCacheLayer bool, tb testing.TB) *Test
|
|||||||
*config.PasswordSettings.Uppercase = false
|
*config.PasswordSettings.Uppercase = false
|
||||||
*config.PasswordSettings.Symbol = false
|
*config.PasswordSettings.Symbol = false
|
||||||
*config.PasswordSettings.Number = false
|
*config.PasswordSettings.Number = false
|
||||||
configStore.Set(config)
|
_, _, err = configStore.Set(config)
|
||||||
|
require.NoError(tb, err)
|
||||||
|
|
||||||
buffer := &bytes.Buffer{}
|
buffer := &bytes.Buffer{}
|
||||||
|
|
||||||
@@ -106,38 +108,30 @@ func (th *TestHelper) UpdateConfig(f func(*model.Config)) {
|
|||||||
old := th.configStore.Get()
|
old := th.configStore.Get()
|
||||||
updated := old.Clone()
|
updated := old.Clone()
|
||||||
f(updated)
|
f(updated)
|
||||||
if _, _, err := th.configStore.Set(updated); err != nil {
|
_, _, err := th.configStore.Set(updated)
|
||||||
panic(err)
|
require.NoError(th.TB, err)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (th *TestHelper) CreateUser(u *model.User) *model.User {
|
func (th *TestHelper) CreateUser(u *model.User) *model.User {
|
||||||
u.EmailVerified = true
|
u.EmailVerified = true
|
||||||
user, err := th.dbStore.User().Save(th.Context, u)
|
user, err := th.dbStore.User().Save(th.Context, u)
|
||||||
if err != nil {
|
require.NoError(th.TB, err)
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return user
|
return user
|
||||||
}
|
}
|
||||||
|
|
||||||
func (th *TestHelper) DeleteUser(u *model.User) {
|
func (th *TestHelper) DeleteUser(u *model.User) {
|
||||||
err := th.dbStore.User().PermanentDelete(th.Context, u.Id)
|
err := th.dbStore.User().PermanentDelete(th.Context, u.Id)
|
||||||
if err != nil {
|
require.NoError(th.TB, err)
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (th *TestHelper) DeleteTeam(t *model.Team) {
|
func (th *TestHelper) DeleteTeam(t *model.Team) {
|
||||||
if err := th.dbStore.Channel().PermanentDeleteByTeam(t.Id); err != nil {
|
err := th.dbStore.Channel().PermanentDeleteByTeam(t.Id)
|
||||||
panic(err)
|
require.NoError(th.TB, err)
|
||||||
}
|
|
||||||
|
|
||||||
if err := th.dbStore.Team().RemoveAllMembersByTeam(t.Id); err != nil {
|
err = th.dbStore.Team().RemoveAllMembersByTeam(t.Id)
|
||||||
panic(err)
|
require.NoError(th.TB, err)
|
||||||
}
|
|
||||||
|
|
||||||
if err := th.dbStore.Team().PermanentDelete(t.Id); err != nil {
|
err = th.dbStore.Team().PermanentDelete(t.Id)
|
||||||
panic(err)
|
require.NoError(th.TB, err)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user