review

Author: ldez

Makefile

@@ -33,11 +33,11 @@ test: build
 	GL_TEST_RUN=1 go test -v -parallel 2 ./...
 .PHONY: test
 
-# ex: T=gofmt.go make test_fix
+# ex: T=multiple-issues-fix.go make test_integration_fix
 # the value of `T` is the name of a file from `test/testdata/fix`
-test_fix: build
+test_integration_fix: build
 	GL_TEST_RUN=1 go test -v ./test -count 1 -run TestFix/$T
-.PHONY: test_fix
+.PHONY: test_integration_fix
 
 test_race: build_race
 	GL_TEST_RUN=1 ./$(BINARY) run -v --timeout=5m

pkg/golinters/gocritic/gocritic.go

@@ -430,11 +430,11 @@ func (s *settingsWrapper) debugChecksFinalState() {
 	var disabledChecks []string
 
 	for _, checker := range s.allCheckers {
-		name := checker.Name
-		if s.inferredEnabledChecks.has(name) {
-			enabledChecks = append(enabledChecks, name)
+		check := checker.Name
+		if s.inferredEnabledChecks.has(check) {
+			enabledChecks = append(enabledChecks, check)
 		} else {
-			disabledChecks = append(disabledChecks, name)
+			disabledChecks = append(disabledChecks, check)
 		}
 	}
 
@@ -512,25 +512,25 @@ func (s *settingsWrapper) validateCheckerTags() error {
 }
 
 func (s *settingsWrapper) validateCheckerNames() error {
-	for _, name := range s.EnabledChecks {
-		if !s.allChecks.has(name) {
-			return fmt.Errorf("enabled check %q doesn't exist, see %s's documentation", name, name)
+	for _, check := range s.EnabledChecks {
+		if !s.allChecks.has(check) {
+			return fmt.Errorf("enabled check %q doesn't exist, see %s's documentation", check, name)
 		}
 	}
 
-	for _, name := range s.DisabledChecks {
-		if !s.allChecks.has(name) {
-			return fmt.Errorf("disabled check %q doesn't exist, see %s documentation", name, name)
+	for _, check := range s.DisabledChecks {
+		if !s.allChecks.has(check) {
+			return fmt.Errorf("disabled check %q doesn't exist, see %s documentation", check, name)
 		}
 	}
 
-	for name := range s.SettingsPerCheck {
-		lcName := strings.ToLower(name)
+	for check := range s.SettingsPerCheck {
+		lcName := strings.ToLower(check)
 		if !s.allChecksLowerCased.has(lcName) {
-			return fmt.Errorf("invalid check settings: check %q doesn't exist, see %s documentation", name, name)
+			return fmt.Errorf("invalid check settings: check %q doesn't exist, see %s documentation", check, name)
 		}
 		if !s.inferredEnabledChecksLowerCased.has(lcName) {
-			s.logger.Warnf("%s: settings were provided for disabled check %q", name, name)
+			s.logger.Warnf("%s: settings were provided for disabled check %q", check, name)
 		}
 	}
 

test/testshared/install.go

@@ -21,14 +21,14 @@ const envGolangciLintInstalled = "GOLANGCI_LINT_INSTALLED"
 // The majority of tests are NOT executed inside the same process,
 // then this is just to limit some cases (~60 cases).
 var (
-	built     bool
 	builtLock sync.RWMutex
+	built     bool
 )
 
 func InstallGolangciLint(tb testing.TB) string {
 	tb.Helper()
 
-	parentPath := findMakeFile(tb)
+	parentPath := findMakefile(tb)
 
 	// Avoids concurrent builds and copies (before the end of the build).
 	f := flock.New(filepath.Join(parentPath, "test.lock"))
@@ -37,7 +37,12 @@ func InstallGolangciLint(tb testing.TB) string {
 		err := f.Lock()
 		require.NoError(tb, err)
 
-		defer func() { _ = f.Unlock() }()
+		defer func() {
+			errU := f.Unlock()
+			if errU != nil {
+				tb.Logf("Can't unlock test.lock: %v", errU)
+			}
+		}()
 
 		builtLock.Lock()
 		defer builtLock.Unlock()
@@ -46,10 +51,6 @@ func InstallGolangciLint(tb testing.TB) string {
 			cmd := exec.Command("make", "-C", parentPath, "build")
 
 			output, err := cmd.CombinedOutput()
-			if err != nil {
-				tb.Log(string(output))
-			}
-
 			require.NoError(tb, err, "can't install golangci-lint %s", string(output))
 
 			built = true
@@ -68,7 +69,7 @@ func InstallGolangciLint(tb testing.TB) string {
 	return abs
 }
 
-func findMakeFile(tb testing.TB) string {
+func findMakefile(tb testing.TB) string {
 	tb.Helper()
 
 	wd, _ := os.Getwd()