From e86560d04cf456d77e1fee1e77006a7d98c3d367 Mon Sep 17 00:00:00 2001
From: Samarth Mishra <139863510+samarth29jc@users.noreply.github.com>
Date: Mon, 4 Nov 2024 15:25:48 +0530
Subject: [PATCH] Fix errcheck issues in
 server/channels/app/imaging/decode_test.go (#28958)

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
---
 server/.golangci.yml                       |  1 -
 server/channels/app/imaging/decode_test.go | 41 ++++++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/server/.golangci.yml b/server/.golangci.yml
index 5b94ba2d17..962797ff52 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -105,7 +105,6 @@ issues:
         channels/app/file_test.go|\
         channels/app/helper_test.go|\
         channels/app/imaging/decode.go|\
-        channels/app/imaging/decode_test.go|\
         channels/app/import_functions.go|\
         channels/app/import_functions_test.go|\
         channels/app/import_utils_test.go|\
diff --git a/server/channels/app/imaging/decode_test.go b/server/channels/app/imaging/decode_test.go
index 63a99f2e64..f7efa07bb8 100644
--- a/server/channels/app/imaging/decode_test.go
+++ b/server/channels/app/imaging/decode_test.go
@@ -53,7 +53,9 @@ func TestDecoderDecode(t *testing.T) {
 		imgFile, err := os.Open(imgDir + "/test.png")
 		require.NoError(t, err)
 		require.NotNil(t, imgFile)
-		defer imgFile.Close()
+		defer func() {
+			require.NoError(t, imgFile.Close())
+		}()
 
 		img, format, err := d.Decode(imgFile)
 		require.NoError(t, err)
@@ -80,7 +82,10 @@ func TestDecoderDecode(t *testing.T) {
 			imgFile, err := os.Open(imgDir + "/test.png")
 			require.NoError(t, err)
 			require.NotNil(t, imgFile)
-			defer imgFile.Close()
+
+			defer func() {
+				require.NoError(t, imgFile.Close())
+			}()
 
 			img, format, err := d.Decode(imgFile)
 			require.NoError(t, err)
@@ -94,7 +99,10 @@ func TestDecoderDecode(t *testing.T) {
 			imgFile, err := os.Open(imgDir + "/test.png")
 			require.NoError(t, err)
 			require.NotNil(t, imgFile)
-			defer imgFile.Close()
+
+			defer func() {
+				require.NoError(t, imgFile.Close())
+			}()
 
 			img, format, err := d.Decode(imgFile)
 			require.NoError(t, err)
@@ -121,7 +129,10 @@ func TestDecoderDecodeMemBounded(t *testing.T) {
 		imgFile, err := os.Open(imgDir + "/test.png")
 		require.NoError(t, err)
 		require.NotNil(t, imgFile)
-		defer imgFile.Close()
+
+		defer func() {
+			require.NoError(t, imgFile.Close())
+		}()
 
 		var wg sync.WaitGroup
 		wg.Add(2)
@@ -131,11 +142,14 @@ func TestDecoderDecodeMemBounded(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			img, format, release, err := d.DecodeMemBounded(imgFile)
-			lock.Lock()
-			imgFile.Seek(0, 0)
-			lock.Unlock()
 			require.NoError(t, err)
 			defer release()
+
+			lock.Lock()
+			_, err = imgFile.Seek(0, 0)
+			require.NoError(t, err)
+			lock.Unlock()
+
 			require.NotNil(t, img)
 			require.Equal(t, "png", format)
 			require.NotNil(t, release)
@@ -145,11 +159,14 @@ func TestDecoderDecodeMemBounded(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			img, format, release, err := d.DecodeMemBounded(imgFile)
-			lock.Lock()
-			imgFile.Seek(0, 0)
-			lock.Unlock()
 			require.NoError(t, err)
 			defer release()
+
+			lock.Lock()
+			_, err = imgFile.Seek(0, 0)
+			require.NoError(t, err)
+			lock.Unlock()
+
 			require.NotNil(t, img)
 			require.Equal(t, "png", format)
 			require.NotNil(t, release)
@@ -207,7 +224,9 @@ func TestDecoderDecodeMemBounded(t *testing.T) {
 		imgFile, err := os.Open(imgDir + "/test.png")
 		require.NoError(t, err)
 		require.NotNil(t, imgFile)
-		defer imgFile.Close()
+		defer func() {
+			require.NoError(t, imgFile.Close())
+		}()
 
 		img, format, release, err := d.DecodeMemBounded(imgFile)
 		require.NoError(t, err)