eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

dev: remove old TODO and remove assert import alias on require. (#1838)

Browse Source
This commit is contained in:
Ludovic Fernandez 2021-03-13 04:45:32 +01:00 committed by GitHub
parent 7a612da13c
commit 9838a57941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/fix_test.go
View File

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
assert "github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/golangci/golangci-lint/test/testshared" "github.com/golangci/golangci-lint/test/testshared"
@ -16,8 +16,8 @@ import (
func TestFix(t *testing.T) { func TestFix(t *testing.T) {
findSources := func(pathPatterns ...string) []string { findSources := func(pathPatterns ...string) []string {
sources, err := filepath.Glob(filepath.Join(pathPatterns...)) sources, err := filepath.Glob(filepath.Join(pathPatterns...))
assert.NoError(t, err) require.NoError(t, err)
assert.NotEmpty(t, sources) require.NotEmpty(t, sources)
return sources return sources
} }
@ -34,7 +34,7 @@ func TestFix(t *testing.T) {
fixDir := filepath.Join(testdataDir, "fix") fixDir := filepath.Join(testdataDir, "fix")
err := exec.Command("cp", "-R", fixDir, tmpDir).Run() err := exec.Command("cp", "-R", fixDir, tmpDir).Run()
assert.NoError(t, err) require.NoError(t, err)
inputs := findSources(tmpDir, "in", "*.go") inputs := findSources(tmpDir, "in", "*.go")
for _, input := range inputs { for _, input := range inputs {
@ -51,16 +51,16 @@ func TestFix(t *testing.T) {
args = append(args, rc.args...) args = append(args, rc.args...)
cfg, err := yaml.Marshal(rc.config) cfg, err := yaml.Marshal(rc.config)
assert.NoError(t, err) require.NoError(t, err)
testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...) testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...)
output, err := ioutil.ReadFile(input) output, err := ioutil.ReadFile(input)
assert.NoError(t, err) require.NoError(t, err)
expectedOutput, err := ioutil.ReadFile(filepath.Join(testdataDir, "fix", "out", filepath.Base(input))) expectedOutput, err := ioutil.ReadFile(filepath.Join(testdataDir, "fix", "out", filepath.Base(input)))
assert.NoError(t, err) require.NoError(t, err)
assert.Equal(t, string(expectedOutput), string(output)) require.Equal(t, string(expectedOutput), string(output))
}) })
} }
} }

61
test/linters_test.go
View File

@ -9,9 +9,10 @@ import (
"strings" "strings"
"testing" "testing"
assert "github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
yaml "gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/test/testshared" "github.com/golangci/golangci-lint/test/testshared"
) )
@ -21,20 +22,18 @@ func runGoErrchk(c *exec.Cmd, defaultExpectedLinter string, files []string, t *t
// and thus the linter exits with exit code 0. So perform the additional // and thus the linter exits with exit code 0. So perform the additional
// assertions only if the error is non-nil. // assertions only if the error is non-nil.
if err != nil { if err != nil {
_, ok := err.(*exec.ExitError) var exitErr *exec.ExitError
assert.True(t, ok, err) require.ErrorAs(t, err, &exitErr)
require.Equal(t, exitcodes.IssuesFound, exitErr.ExitCode())
} }
// TODO: uncomment after deprecating go1.11
// assert.Equal(t, exitcodes.IssuesFound, exitErr.ExitCode())
fullshort := make([]string, 0, len(files)*2) fullshort := make([]string, 0, len(files)*2)
for _, f := range files { for _, f := range files {
fullshort = append(fullshort, f, filepath.Base(f)) fullshort = append(fullshort, f, filepath.Base(f))
} }
err = errorCheck(string(output), false, defaultExpectedLinter, fullshort...) err = errorCheck(string(output), false, defaultExpectedLinter, fullshort...)
assert.NoError(t, err) require.NoError(t, err)
} }
func testSourcesFromDir(t *testing.T, dir string) { func testSourcesFromDir(t *testing.T, dir string) {
@ -42,8 +41,8 @@ func testSourcesFromDir(t *testing.T, dir string) {
findSources := func(pathPatterns ...string) []string { findSources := func(pathPatterns ...string) []string {
sources, err := filepath.Glob(filepath.Join(pathPatterns...)) sources, err := filepath.Glob(filepath.Join(pathPatterns...))
assert.NoError(t, err) require.NoError(t, err)
assert.NotEmpty(t, sources) require.NotEmpty(t, sources)
return sources return sources
} }
sources := findSources(dir, "*.go") sources := findSources(dir, "*.go")
@ -77,7 +76,7 @@ func TestGoimportsLocal(t *testing.T) {
args = append(args, rc.args...) args = append(args, rc.args...)
cfg, err := yaml.Marshal(rc.config) cfg, err := yaml.Marshal(rc.config)
assert.NoError(t, err) require.NoError(t, err)
testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...). testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).
ExpectHasIssue("testdata/goimports/goimports.go:8: File is not `goimports`-ed") ExpectHasIssue("testdata/goimports/goimports.go:8: File is not `goimports`-ed")
@ -93,7 +92,7 @@ func TestGciLocal(t *testing.T) {
args = append(args, rc.args...) args = append(args, rc.args...)
cfg, err := yaml.Marshal(rc.config) cfg, err := yaml.Marshal(rc.config)
assert.NoError(t, err) require.NoError(t, err)
testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...). testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).
ExpectHasIssue("testdata/gci/gci.go:7: File is not `gci`-ed") ExpectHasIssue("testdata/gci/gci.go:7: File is not `gci`-ed")
@ -101,19 +100,19 @@ func TestGciLocal(t *testing.T) {
func saveConfig(t *testing.T, cfg map[string]interface{}) (cfgPath string, finishFunc func()) { func saveConfig(t *testing.T, cfg map[string]interface{}) (cfgPath string, finishFunc func()) {
f, err := ioutil.TempFile("", "golangci_lint_test") f, err := ioutil.TempFile("", "golangci_lint_test")
assert.NoError(t, err) require.NoError(t, err)
cfgPath = f.Name() + ".yml" cfgPath = f.Name() + ".yml"
err = os.Rename(f.Name(), cfgPath) err = os.Rename(f.Name(), cfgPath)
assert.NoError(t, err) require.NoError(t, err)
err = yaml.NewEncoder(f).Encode(cfg) err = yaml.NewEncoder(f).Encode(cfg)
assert.NoError(t, err) require.NoError(t, err)
return cfgPath, func() { return cfgPath, func() {
assert.NoError(t, f.Close()) require.NoError(t, f.Close())
if os.Getenv("GL_KEEP_TEMP_FILES") != "1" { if os.Getenv("GL_KEEP_TEMP_FILES") != "1" {
assert.NoError(t, os.Remove(cfgPath)) require.NoError(t, os.Remove(cfgPath))
} }
} }
} }
@ -168,10 +167,10 @@ type runContext struct {
func buildConfigFromShortRepr(t *testing.T, repr string, config map[string]interface{}) { func buildConfigFromShortRepr(t *testing.T, repr string, config map[string]interface{}) {
kv := strings.Split(repr, "=") kv := strings.Split(repr, "=")
assert.Len(t, kv, 2) require.Len(t, kv, 2)
keyParts := strings.Split(kv[0], ".") keyParts := strings.Split(kv[0], ".")
assert.True(t, len(keyParts) >= 2, len(keyParts)) require.True(t, len(keyParts) >= 2, len(keyParts))
lastObj := config lastObj := config
for _, k := range keyParts[:len(keyParts)-1] { for _, k := range keyParts[:len(keyParts)-1] {
@ -197,7 +196,7 @@ func skipMultilineComment(scanner *bufio.Scanner) {
func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext { func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext {
f, err := os.Open(sourcePath) f, err := os.Open(sourcePath)
assert.NoError(t, err) require.NoError(t, err)
defer f.Close() defer f.Close()
rc := &runContext{} rc := &runContext{}
@ -218,16 +217,16 @@ func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext
line = strings.TrimLeft(strings.TrimPrefix(line, "//"), " ") line = strings.TrimLeft(strings.TrimPrefix(line, "//"), " ")
if strings.HasPrefix(line, "args: ") { if strings.HasPrefix(line, "args: ") {
assert.Nil(t, rc.args) require.Nil(t, rc.args)
args := strings.TrimPrefix(line, "args: ") args := strings.TrimPrefix(line, "args: ")
assert.NotEmpty(t, args) require.NotEmpty(t, args)
rc.args = strings.Split(args, " ") rc.args = strings.Split(args, " ")
continue continue
} }
if strings.HasPrefix(line, "config: ") { if strings.HasPrefix(line, "config: ") {
repr := strings.TrimPrefix(line, "config: ") repr := strings.TrimPrefix(line, "config: ")
assert.NotEmpty(t, repr) require.NotEmpty(t, repr)
if rc.config == nil { if rc.config == nil {
rc.config = map[string]interface{}{} rc.config = map[string]interface{}{}
} }
@ -237,19 +236,19 @@ func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext
if strings.HasPrefix(line, "config_path: ") { if strings.HasPrefix(line, "config_path: ") {
configPath := strings.TrimPrefix(line, "config_path: ") configPath := strings.TrimPrefix(line, "config_path: ")
assert.NotEmpty(t, configPath) require.NotEmpty(t, configPath)
rc.configPath = configPath rc.configPath = configPath
continue continue
} }
if strings.HasPrefix(line, "expected_linter: ") { if strings.HasPrefix(line, "expected_linter: ") {
expectedLinter := strings.TrimPrefix(line, "expected_linter: ") expectedLinter := strings.TrimPrefix(line, "expected_linter: ")
assert.NotEmpty(t, expectedLinter) require.NotEmpty(t, expectedLinter)
rc.expectedLinter = expectedLinter rc.expectedLinter = expectedLinter
continue continue
} }
assert.Fail(t, "invalid prefix of comment line %s", line) require.Fail(t, "invalid prefix of comment line %s", line)
} }
// guess the expected linter if none is specified // guess the expected linter if none is specified
@ -257,7 +256,7 @@ func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext
for _, arg := range rc.args { for _, arg := range rc.args {
if strings.HasPrefix(arg, "-E") && !strings.Contains(arg, ",") { if strings.HasPrefix(arg, "-E") && !strings.Contains(arg, ",") {
if rc.expectedLinter != "" { if rc.expectedLinter != "" {
assert.Fail(t, "could not infer expected linter for errors because multiple linters are enabled. Please use the `expected_linter: ` directive in your test to indicate the linter-under-test.") //nolint:lll require.Fail(t, "could not infer expected linter for errors because multiple linters are enabled. Please use the `expected_linter: ` directive in your test to indicate the linter-under-test.") //nolint:lll
break break
} }
rc.expectedLinter = arg[2:] rc.expectedLinter = arg[2:]
@ -270,7 +269,7 @@ func extractRunContextFromComments(t *testing.T, sourcePath string) *runContext
func TestExtractRunContextFromComments(t *testing.T) { func TestExtractRunContextFromComments(t *testing.T) {
rc := extractRunContextFromComments(t, filepath.Join(testdataDir, "goimports", "goimports.go")) rc := extractRunContextFromComments(t, filepath.Join(testdataDir, "goimports", "goimports.go"))
assert.Equal(t, []string{"-Egoimports"}, rc.args) require.Equal(t, []string{"-Egoimports"}, rc.args)
} }
func TestTparallel(t *testing.T) { func TestTparallel(t *testing.T) {
@ -284,7 +283,7 @@ func TestTparallel(t *testing.T) {
args = append(args, rc.args...) args = append(args, rc.args...)
cfg, err := yaml.Marshal(rc.config) cfg, err := yaml.Marshal(rc.config)
assert.NoError(t, err) require.NoError(t, err)
testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...). testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).
ExpectHasIssue( ExpectHasIssue(
@ -302,7 +301,7 @@ func TestTparallel(t *testing.T) {
args = append(args, rc.args...) args = append(args, rc.args...)
cfg, err := yaml.Marshal(rc.config) cfg, err := yaml.Marshal(rc.config)
assert.NoError(t, err) require.NoError(t, err)
testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...). testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).
ExpectHasIssue( ExpectHasIssue(
@ -320,7 +319,7 @@ func TestTparallel(t *testing.T) {
args = append(args, rc.args...) args = append(args, rc.args...)
cfg, err := yaml.Marshal(rc.config) cfg, err := yaml.Marshal(rc.config)
assert.NoError(t, err) require.NoError(t, err)
testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).ExpectNoIssues() testshared.NewLintRunner(t).RunWithYamlConfig(string(cfg), args...).ExpectNoIssues()
}) })