From bfd1d49e068d6b180329070d4f2067c6236edb88 Mon Sep 17 00:00:00 2001 From: TheInvincible <139259364+TheInvincibleRalph@users.noreply.github.com> Date: Fri, 18 Oct 2024 07:29:49 +0100 Subject: [PATCH] Fix errcheck issue in subpath_test.go (#28791) * Fix errcheck issue in subpath_test.go * Fix govet error --------- Co-authored-by: Mattermost Build --- server/.golangci.yml | 1 - server/channels/utils/subpath_test.go | 33 +++++++++++++++++++-------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index b0b1178589..d1fab066bc 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -259,7 +259,6 @@ issues: channels/testlib/helper.go|\ channels/utils/fileutils/fileutils_test.go|\ channels/utils/license_test.go|\ - channels/utils/subpath_test.go|\ channels/web/oauth.go|\ channels/web/oauth_test.go|\ channels/web/response_writer_wrapper_test.go|\ diff --git a/server/channels/utils/subpath_test.go b/server/channels/utils/subpath_test.go index 3b6b69e873..885606ff22 100644 --- a/server/channels/utils/subpath_test.go +++ b/server/channels/utils/subpath_test.go @@ -32,7 +32,8 @@ func TestUpdateAssetsSubpathFromConfig(t *testing.T) { err := os.Setenv("IS_CI", "true") require.NoError(t, err) defer func() { - os.Unsetenv("IS_CI") + err = os.Unsetenv("IS_CI") + require.NoError(t, err) }() err = utils.UpdateAssetsSubpathFromConfig(nil) @@ -42,8 +43,12 @@ func TestUpdateAssetsSubpathFromConfig(t *testing.T) { t.Run("no config", func(t *testing.T) { tempDir, err := os.MkdirTemp("", "test_update_assets_subpath") require.NoError(t, err) - defer os.RemoveAll(tempDir) - os.Chdir(tempDir) + defer func() { + err = os.RemoveAll(tempDir) + require.NoError(t, err) + }() + err = os.Chdir(tempDir) + require.NoError(t, err) err = utils.UpdateAssetsSubpathFromConfig(nil) require.Error(t, err) @@ -54,8 +59,12 @@ func TestUpdateAssetsSubpath(t *testing.T) { t.Run("no client dir", func(t *testing.T) { tempDir, err := os.MkdirTemp("", "test_update_assets_subpath") require.NoError(t, err) - defer os.RemoveAll(tempDir) - os.Chdir(tempDir) + defer func() { + err = os.RemoveAll(tempDir) + require.NoError(t, err) + }() + err = os.Chdir(tempDir) + require.NoError(t, err) err = utils.UpdateAssetsSubpath("/") require.Error(t, err) @@ -64,8 +73,12 @@ func TestUpdateAssetsSubpath(t *testing.T) { t.Run("valid", func(t *testing.T) { tempDir, err := os.MkdirTemp("", "test_update_assets_subpath") require.NoError(t, err) - defer os.RemoveAll(tempDir) - os.Chdir(tempDir) + defer func() { + err = os.RemoveAll(tempDir) + require.NoError(t, err) + }() + err = os.Chdir(tempDir) + require.NoError(t, err) err = os.Mkdir(model.ClientDir, 0700) require.NoError(t, err) @@ -162,9 +175,9 @@ func TestUpdateAssetsSubpath(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.Description, func(t *testing.T) { - os.WriteFile(filepath.Join(tempDir, model.ClientDir, "root.html"), []byte(testCase.RootHTML), 0700) - os.WriteFile(filepath.Join(tempDir, model.ClientDir, "main.css"), []byte(testCase.MainCSS), 0700) - os.WriteFile(filepath.Join(tempDir, model.ClientDir, "manifest.json"), []byte(testCase.ManifestJSON), 0700) + require.NoError(t, os.WriteFile(filepath.Join(tempDir, model.ClientDir, "root.html"), []byte(testCase.RootHTML), 0700)) + require.NoError(t, os.WriteFile(filepath.Join(tempDir, model.ClientDir, "main.css"), []byte(testCase.MainCSS), 0700)) + require.NoError(t, os.WriteFile(filepath.Join(tempDir, model.ClientDir, "manifest.json"), []byte(testCase.ManifestJSON), 0700)) err := utils.UpdateAssetsSubpath(testCase.Subpath) if testCase.ExpectedError != nil { require.Equal(t, testCase.ExpectedError, err)