From f48fd7b79175bdbf7b3568dc1da9bd8569b74784 Mon Sep 17 00:00:00 2001
From: mas-who <151511568+mas-who@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:13:45 +0200
Subject: [PATCH] GH-28752 fix errcheck lint issues in
 server/channels/testlib/helper.go (#29260)

---
 server/.golangci.yml              |  1 -
 server/channels/testlib/helper.go | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/.golangci.yml b/server/.golangci.yml
index f9ec136024d..32b5e87f912 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -203,7 +203,6 @@ issues:
         channels/store/storetest/team_store.go|\
         channels/store/storetest/thread_store.go|\
         channels/store/storetest/user_store.go|\
-        channels/testlib/helper.go|\
         channels/utils/license_test.go|\
         channels/web/oauth_test.go|\
         channels/web/saml.go|\
diff --git a/server/channels/testlib/helper.go b/server/channels/testlib/helper.go
index d83ee801e34..6177bd75355 100644
--- a/server/channels/testlib/helper.go
+++ b/server/channels/testlib/helper.go
@@ -73,10 +73,16 @@ func NewMainHelperWithOptions(options *HelperOptions) *MainHelper {
 		Logger: logger,
 	}
 
-	mlog.NewLogger()
+	_, err := mlog.NewLogger()
+	if err != nil {
+		log.Fatal(err)
+	}
 	flag.Parse()
 
-	utils.TranslationsPreInit()
+	err = utils.TranslationsPreInit()
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	if options != nil {
 		if options.EnableStore && !testing.Short() {
@@ -92,7 +98,13 @@ func NewMainHelperWithOptions(options *HelperOptions) *MainHelper {
 }
 
 func (h *MainHelper) Main(m *testing.M) {
-	defer h.Logger.Shutdown()
+	defer func() {
+		err := h.Logger.Shutdown()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
+
 	if h.testResourcePath != "" {
 		prevDir, err := os.Getwd()
 		if err != nil {