dev: improve and clean fix_test (golangci#2457)

SeigeC · Apr 4, 2023 · c73de9c · c73de9c
1 parent 5d4c9c6
commit c73de9c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git a/test/fix_test.go b/test/fix_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 
+	"github.com/golangci/golangci-lint/pkg/exitcodes"
 	"github.com/golangci/golangci-lint/test/testshared"
 )
 
@@ -52,7 +53,19 @@ func TestFix(t *testing.T) {
 			cfg, err := yaml.Marshal(rc.config)
 			require.NoError(t, err)
 
-			testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...)
+			var runResult *testshared.RunResult
+			if rc.configPath != "" {
+				args = append(args, "-c", rc.configPath)
+				runResult = testshared.NewLintRunner(t).RunCommand("run", args...)
+			} else {
+				runResult = testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...)
+			}
+
+			// nolintlint test uses non existing linters (bob, alice)
+			if rc.expectedLinter != "nolintlint" {
+				runResult.ExpectExitCode(exitcodes.Success)
+			}
+
 			output, err := os.ReadFile(input)
 			require.NoError(t, err)
 

diff --git a/test/testdata/configs/gocritic-fix.yml b/test/testdata/configs/gocritic-fix.yml
@@ -0,0 +1,8 @@
+linters-settings:
+  gocritic:
+    enabled-checks:
+      - ruleguard
+    settings:
+      ruleguard:
+        rules: 'ruleguard/rangeExprCopy.go,ruleguard/strings_simplify.go'
+
diff --git a/test/testdata/fix/in/gocritic.go b/test/testdata/fix/in/gocritic.go
@@ -1,6 +1,5 @@
-//args: -Egocritic
-//config: linters-settings.gocritic.enabled-checks=ruleguard
-//config: linters-settings.gocritic.settings.ruleguard.rules=ruleguard/rangeExprCopy.go,ruleguard/strings_simplify.go
+// args: -Egocritic
+// config_path: testdata/configs/gocritic-fix.yml
 package p
 
 import (

diff --git a/test/testdata/fix/in/unused.go b/test/testdata/fix/in/unused.go
diff --git a/test/testdata/fix/out/gocritic.go b/test/testdata/fix/out/gocritic.go
@@ -1,6 +1,5 @@
-//args: -Egocritic
-//config: linters-settings.gocritic.enabled-checks=ruleguard
-//config: linters-settings.gocritic.settings.ruleguard.rules=ruleguard/rangeExprCopy.go,ruleguard/strings_simplify.go
+// args: -Egocritic
+// config_path: testdata/configs/gocritic-fix.yml
 package p
 
 import (

diff --git a/test/testdata/fix/out/unused.go b/test/testdata/fix/out/unused.go