Skip to content

Commit e55a11e

Browse files
mas-whodevXpranay
authored andcommitted
mattermostGH-28752 fix errcheck lint issues in server/channels/testlib/helper.go (mattermost#29260)
1 parent 533e04d commit e55a11e

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

server/.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ issues:
202202
channels/store/storetest/team_store.go|\
203203
channels/store/storetest/thread_store.go|\
204204
channels/store/storetest/user_store.go|\
205-
channels/testlib/helper.go|\
206205
channels/utils/license_test.go|\
207206
channels/web/oauth_test.go|\
208207
channels/web/saml.go|\

server/channels/testlib/helper.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,16 @@ func NewMainHelperWithOptions(options *HelperOptions) *MainHelper {
7373
Logger: logger,
7474
}
7575

76-
mlog.NewLogger()
76+
_, err := mlog.NewLogger()
77+
if err != nil {
78+
log.Fatal(err)
79+
}
7780
flag.Parse()
7881

79-
utils.TranslationsPreInit()
82+
err = utils.TranslationsPreInit()
83+
if err != nil {
84+
log.Fatal(err)
85+
}
8086

8187
if options != nil {
8288
if options.EnableStore && !testing.Short() {
@@ -92,7 +98,13 @@ func NewMainHelperWithOptions(options *HelperOptions) *MainHelper {
9298
}
9399

94100
func (h *MainHelper) Main(m *testing.M) {
95-
defer h.Logger.Shutdown()
101+
defer func() {
102+
err := h.Logger.Shutdown()
103+
if err != nil {
104+
log.Fatal(err)
105+
}
106+
}()
107+
96108
if h.testResourcePath != "" {
97109
prevDir, err := os.Getwd()
98110
if err != nil {

0 commit comments

Comments
 (0)