[MM-61105] Fix errcheck linter errors in config_test.go (#30689)

Этот коммит содержится в:
Ben Schumacher
2025-04-28 14:53:45 +02:00
коммит произвёл GitHub
родитель 34fb9adbc2
Коммит 6fc60c8e5f
2 изменённых файлов: 17 добавлений и 9 удалений

Просмотреть файл

@@ -90,7 +90,6 @@ issues:
channels/api4/websocket_test.go|\ channels/api4/websocket_test.go|\
channels/app/bot_test.go|\ channels/app/bot_test.go|\
channels/app/brand.go|\ channels/app/brand.go|\
channels/app/config_test.go|\
channels/app/file.go|\ channels/app/file.go|\
channels/app/file_test.go|\ channels/app/file_test.go|\
channels/app/helper_test.go|\ channels/app/helper_test.go|\

Просмотреть файл

@@ -10,6 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
@@ -95,37 +96,45 @@ func TestEnsureInstallationDate(t *testing.T) {
for _, tc := range tt { for _, tc := range tt {
t.Run(tc.Name, func(t *testing.T) { t.Run(tc.Name, func(t *testing.T) {
sqlStore := th.GetSqlStore() sqlStore := th.GetSqlStore()
sqlStore.GetMaster().Exec("DELETE FROM Users") _, err := sqlStore.GetMaster().Exec("DELETE FROM Users")
assert.NoError(t, err)
for _, createAt := range tc.UsersCreationDates { for _, createAt := range tc.UsersCreationDates {
user := th.CreateUser() user := th.CreateUser()
user.CreateAt = createAt user.CreateAt = createAt
sqlStore.GetMaster().Exec("UPDATE Users SET CreateAt = ? WHERE Id = ?", createAt, user.Id) _, err = sqlStore.GetMaster().Exec("UPDATE Users SET CreateAt = ? WHERE Id = ?", createAt, user.Id)
assert.NoError(t, err)
} }
if tc.PrevInstallationDate == nil { if tc.PrevInstallationDate == nil {
th.App.Srv().Store().System().PermanentDeleteByName(model.SystemInstallationDateKey) _, err = th.App.Srv().Store().System().PermanentDeleteByName(model.SystemInstallationDateKey)
assert.NoError(t, err)
} else { } else {
th.App.Srv().Store().System().SaveOrUpdate(&model.System{ err = th.App.Srv().Store().System().SaveOrUpdate(&model.System{
Name: model.SystemInstallationDateKey, Name: model.SystemInstallationDateKey,
Value: strconv.FormatInt(*tc.PrevInstallationDate, 10), Value: strconv.FormatInt(*tc.PrevInstallationDate, 10),
}) })
assert.NoError(t, err)
} }
err := th.App.Srv().ensureInstallationDate() err = th.App.Srv().ensureInstallationDate()
if tc.ExpectedInstallationDate == nil { if tc.ExpectedInstallationDate == nil {
assert.Error(t, err) assert.Error(t, err)
} else { } else {
assert.NoError(t, err) assert.NoError(t, err)
data, err := th.App.Srv().Store().System().GetByName(model.SystemInstallationDateKey) var data *model.System
data, err = th.App.Srv().Store().System().GetByName(model.SystemInstallationDateKey)
assert.NoError(t, err) assert.NoError(t, err)
value, _ := strconv.ParseInt(data.Value, 10, 64) var value int64
value, err = strconv.ParseInt(data.Value, 10, 64)
require.NoError(t, err)
assert.True(t, *tc.ExpectedInstallationDate <= value && *tc.ExpectedInstallationDate+1000 >= value) assert.True(t, *tc.ExpectedInstallationDate <= value && *tc.ExpectedInstallationDate+1000 >= value)
} }
sqlStore.GetMaster().Exec("DELETE FROM Users") _, err = sqlStore.GetMaster().Exec("DELETE FROM Users")
assert.NoError(t, err)
}) })
} }
} }