dev: review and clean linter tests (#3139)

Author: ldez

Diff for: .golangci.yml

@@ -136,7 +136,6 @@ issues:
     - path: pkg/lint/lintersdb/manager.go
       text: "SA1019: (.+).(GoVersion|LangVersion) is deprecated: use the global `run.go` instead."
 
-
 run:
   timeout: 5m
   go: '1.17' # TODO(ldez): we force to use an old version of Go for the CI and the tests.

Diff for: pkg/result/processors/sort_results.go

@@ -90,10 +90,8 @@ var (
 
 type ByName struct{ next comparator }
 
-//nolint:golint
 func (cmp ByName) Next() comparator { return cmp.next }
 
-//nolint:golint
 func (cmp ByName) Compare(a, b *result.Issue) compareResult {
 	var res compareResult
 
@@ -110,10 +108,8 @@ func (cmp ByName) Compare(a, b *result.Issue) compareResult {
 
 type ByLine struct{ next comparator }
 
-//nolint:golint
 func (cmp ByLine) Next() comparator { return cmp.next }
 
-//nolint:golint
 func (cmp ByLine) Compare(a, b *result.Issue) compareResult {
 	var res compareResult
 
@@ -130,10 +126,8 @@ func (cmp ByLine) Compare(a, b *result.Issue) compareResult {
 
 type ByColumn struct{ next comparator }
 
-//nolint:golint
 func (cmp ByColumn) Next() comparator { return cmp.next }
 
-//nolint:golint
 func (cmp ByColumn) Compare(a, b *result.Issue) compareResult {
 	var res compareResult
 

Diff for: test/enabled_linters_test.go

@@ -10,72 +10,11 @@ import (
 	"github.com/golangci/golangci-lint/test/testshared"
 )
 
-func inSlice(s []string, v string) bool {
-	for _, sv := range s {
-		if sv == v {
-			return true
-		}
-	}
-
-	return false
-}
-
-func getEnabledByDefaultFastLintersExcept(except ...string) []string {
-	m := lintersdb.NewManager(nil, nil)
-	ebdl := m.GetAllEnabledByDefaultLinters()
-	var ret []string
-	for _, lc := range ebdl {
-		if lc.IsSlowLinter() {
-			continue
-		}
-
-		if !inSlice(except, lc.Name()) {
-			ret = append(ret, lc.Name())
-		}
-	}
-
-	return ret
-}
-
-func getAllFastLintersWith(with ...string) []string {
-	linters := lintersdb.NewManager(nil, nil).GetAllSupportedLinterConfigs()
-	ret := append([]string{}, with...)
-	for _, lc := range linters {
-		if lc.IsSlowLinter() {
-			continue
-		}
-		ret = append(ret, lc.Name())
-	}
-
-	return ret
-}
-
-func getEnabledByDefaultLinters() []string {
-	ebdl := lintersdb.NewManager(nil, nil).GetAllEnabledByDefaultLinters()
-	var ret []string
-	for _, lc := range ebdl {
-		ret = append(ret, lc.Name())
-	}
-
-	return ret
-}
-
-func getEnabledByDefaultFastLintersWith(with ...string) []string {
-	ebdl := lintersdb.NewManager(nil, nil).GetAllEnabledByDefaultLinters()
-	ret := append([]string{}, with...)
-	for _, lc := range ebdl {
-		if lc.IsSlowLinter() {
-			continue
-		}
-
-		ret = append(ret, lc.Name())
-	}
-
-	return ret
-}
-
 //nolint:funlen
 func TestEnabledLinters(t *testing.T) {
+	// require to display the message "Active x linters: [x,y]"
+	t.Setenv("GL_TEST_RUN", "1")
+
 	cases := []struct {
 		name           string
 		cfg            string
@@ -93,28 +32,28 @@ func TestEnabledLinters(t *testing.T) {
 			enabledLinters: getEnabledByDefaultFastLintersExcept("govet"),
 		},
 		{
-			name: "enable golint in config",
+			name: "enable revive in config",
 			cfg: `
 			linters:
 				enable:
-					- golint
+					- revive
 			`,
-			enabledLinters: getEnabledByDefaultFastLintersWith("golint"),
+			enabledLinters: getEnabledByDefaultFastLintersWith("revive"),
 		},
 		{
 			name:           "disable govet in cmd",
 			args:           []string{"-Dgovet"},
 			enabledLinters: getEnabledByDefaultFastLintersExcept("govet"),
 		},
 		{
-			name: "enable gofmt in cmd and enable golint in config",
+			name: "enable gofmt in cmd and enable revive in config",
 			args: []string{"-Egofmt"},
 			cfg: `
 			linters:
 				enable:
-					- golint
+					- revive
 			`,
-			enabledLinters: getEnabledByDefaultFastLintersWith("golint", "gofmt"),
+			enabledLinters: getEnabledByDefaultFastLintersWith("revive", "gofmt"),
 		},
 		{
 			name: "fast option in config",
@@ -195,3 +134,67 @@ func TestEnabledLinters(t *testing.T) {
 		})
 	}
 }
+
+func inSlice(s []string, v string) bool {
+	for _, sv := range s {
+		if sv == v {
+			return true
+		}
+	}
+
+	return false
+}
+
+func getEnabledByDefaultFastLintersExcept(except ...string) []string {
+	m := lintersdb.NewManager(nil, nil)
+	ebdl := m.GetAllEnabledByDefaultLinters()
+	var ret []string
+	for _, lc := range ebdl {
+		if lc.IsSlowLinter() {
+			continue
+		}
+
+		if !inSlice(except, lc.Name()) {
+			ret = append(ret, lc.Name())
+		}
+	}
+
+	return ret
+}
+
+func getAllFastLintersWith(with ...string) []string {
+	linters := lintersdb.NewManager(nil, nil).GetAllSupportedLinterConfigs()
+	ret := append([]string{}, with...)
+	for _, lc := range linters {
+		if lc.IsSlowLinter() {
+			continue
+		}
+		ret = append(ret, lc.Name())
+	}
+
+	return ret
+}
+
+func getEnabledByDefaultLinters() []string {
+	ebdl := lintersdb.NewManager(nil, nil).GetAllEnabledByDefaultLinters()
+	var ret []string
+	for _, lc := range ebdl {
+		ret = append(ret, lc.Name())
+	}
+
+	return ret
+}
+
+func getEnabledByDefaultFastLintersWith(with ...string) []string {
+	ebdl := lintersdb.NewManager(nil, nil).GetAllEnabledByDefaultLinters()
+	ret := append([]string{}, with...)
+	for _, lc := range ebdl {
+		if lc.IsSlowLinter() {
+			continue
+		}
+
+		ret = append(ret, lc.Name())
+	}
+
+	return ret
+}