dev: follow standards by using 'want' instead of 'ERROR' for tests (#3104)

Author: ldez

Makefile

@@ -40,7 +40,7 @@ test_race: build_race
 .PHONY: test_race
 
 test_linters:
-	GL_TEST_RUN=1 go test -v ./test -count 1 -run TestSourcesFromTestdataWithIssuesDir/$T
+	GL_TEST_RUN=1 go test -v ./test -count 1 -run TestSourcesFromTestdata/$T
 .PHONY: test_linters
 
 # Maintenance

test/data.go

@@ -8,37 +8,29 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/golangci/golangci-lint/pkg/exitcodes"
 	"github.com/golangci/golangci-lint/test/testshared"
 )
 
 func TestFix(t *testing.T) {
-	findSources := func(pathPatterns ...string) []string {
-		sources, err := filepath.Glob(filepath.Join(pathPatterns...))
-		require.NoError(t, err)
-		require.NotEmpty(t, sources)
-		return sources
-	}
-
 	tmpDir := filepath.Join(testdataDir, "fix.tmp")
-	os.RemoveAll(tmpDir) // cleanup after previous runs
+	_ = os.RemoveAll(tmpDir) // cleanup previous runs
 
 	if os.Getenv("GL_KEEP_TEMP_FILES") == "1" {
 		t.Logf("Temp dir for fix test: %s", tmpDir)
 	} else {
-		t.Cleanup(func() {
-			os.RemoveAll(tmpDir)
-		})
+		t.Cleanup(func() { _ = os.RemoveAll(tmpDir) })
 	}
 
-	fixDir := filepath.Join(testdataDir, "fix")
-	err := exec.Command("cp", "-R", fixDir, tmpDir).Run()
+	sourcesDir := filepath.Join(testdataDir, "fix")
+
+	err := exec.Command("cp", "-R", sourcesDir, tmpDir).Run()
 	require.NoError(t, err)
 
 	testshared.InstallGolangciLint(t)
 
-	inputs := findSources(tmpDir, "in", "*.go")
-	for _, input := range inputs {
+	sources := findSources(t, tmpDir, "in", "*.go")
+
+	for _, input := range sources {
 		input := input
 		t.Run(filepath.Base(input), func(t *testing.T) {
 			t.Parallel()
@@ -49,22 +41,19 @@ func TestFix(t *testing.T) {
 				return
 			}
 
-			runResult := testshared.NewRunnerBuilder(t).
-				WithRunContext(rc).
-				WithTargetPath(input).
+			testshared.NewRunnerBuilder(t).
 				WithArgs(
 					"--disable-all",
 					"--print-issued-lines=false",
 					"--print-linter-name=false",
 					"--out-format=line-number",
-					"--fix").
+					"--fix",
+				).
+				WithRunContext(rc).
+				WithTargetPath(input).
 				Runner().
-				Run()
-
-			// nolintlint test uses non existing linters (bob, alice)
-			if rc.ExpectedLinter != "nolintlint" {
-				runResult.ExpectExitCode(exitcodes.Success)
-			}
+				Run().
+				ExpectExitCode(rc.ExitCode)
 
 			output, err := os.ReadFile(input)
 			require.NoError(t, err)