Skip to content

Commit 5df8766

Browse files
committed
tests: update linter tests
1 parent ca262fd commit 5df8766

File tree

128 files changed

+760
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+760
-649
lines changed

Diff for: pkg/golinters/copyloopvar/testdata/copyloopvar.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
copyloopvar:
5-
check-alias: true
3+
linters:
4+
settings:
5+
copyloopvar:
6+
check-alias: true

Diff for: pkg/golinters/cyclop/testdata/cyclop.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
cyclop:
5-
max-complexity: 15
3+
linters:
4+
settings:
5+
cyclop:
6+
max-complexity: 15

Diff for: pkg/golinters/decorder/testdata/decorder_custom.yml

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
version: "2"
22

3-
linters-settings:
4-
decorder:
5-
dec-order:
6-
- type
7-
- const
8-
- var
9-
- func
10-
disable-dec-order-check: false
11-
disable-init-func-first-check: false
12-
disable-dec-num-check: false
3+
linters:
4+
settings:
5+
decorder:
6+
dec-order:
7+
- type
8+
- const
9+
- var
10+
- func
11+
disable-dec-order-check: false
12+
disable-init-func-first-check: false
13+
disable-dec-num-check: false

Diff for: pkg/golinters/depguard/testdata/depguard.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
version: "2"
22

3-
linters-settings:
4-
depguard:
5-
rules:
6-
main:
7-
deny:
8-
- pkg: compress
9-
desc: "nope"
10-
- pkg: log
11-
desc: "don't use log"
12-
- pkg: "golang.org/x/tools/go/analysis"
13-
desc: "example import with dot"
14-
3+
linters:
4+
settings:
5+
depguard:
6+
rules:
7+
main:
8+
deny:
9+
- pkg: compress
10+
desc: "nope"
11+
- pkg: log
12+
desc: "don't use log"
13+
- pkg: "golang.org/x/tools/go/analysis"
14+
desc: "example import with dot"
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
version: "2"
22

3-
linters-settings:
4-
depguard:
5-
rules:
6-
main:
7-
deny:
8-
- pkg: fmt
9-
desc: "nope"
10-
- pkg: strings
11-
desc: "nope"
12-
- pkg: compress
13-
desc: "nope"
14-
- pkg: log
15-
desc: "don't use log"
16-
- pkg: "golang.org/x/tools/go/analysis"
17-
desc: "example import with dot"
18-
3+
linters:
4+
settings:
5+
depguard:
6+
rules:
7+
main:
8+
deny:
9+
- pkg: fmt
10+
desc: "nope"
11+
- pkg: strings
12+
desc: "nope"
13+
- pkg: compress
14+
desc: "nope"
15+
- pkg: log
16+
desc: "don't use log"
17+
- pkg: "golang.org/x/tools/go/analysis"
18+
desc: "example import with dot"
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
version: "2"
22

3-
linters-settings:
4-
depguard:
5-
rules:
6-
main:
7-
files:
8-
- "!**/*_ignore_file_rules.go"
9-
deny:
10-
- pkg: compress
11-
desc: "nope"
12-
- pkg: log
13-
desc: "don't use log"
14-
- pkg: "golang.org/x/tools/go/analysis"
15-
desc: "example import with dot"
3+
linters:
4+
settings:
5+
depguard:
6+
rules:
7+
main:
8+
files:
9+
- "!**/*_ignore_file_rules.go"
10+
deny:
11+
- pkg: compress
12+
desc: "nope"
13+
- pkg: log
14+
desc: "don't use log"
15+
- pkg: "golang.org/x/tools/go/analysis"
16+
desc: "example import with dot"

Diff for: pkg/golinters/dupl/testdata/dupl.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
dupl:
5-
threshold: 20
3+
linters:
4+
settings:
5+
dupl:
6+
threshold: 20
+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
version: "2"
22

3-
linters-settings:
4-
dupword:
5-
ignore:
6-
- "the"
3+
linters:
4+
settings:
5+
dupword:
6+
ignore:
7+
- "the"
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
version: "2"
22

3-
linters-settings:
4-
errcheck:
5-
check-blank: true
6-
exclude-functions:
7-
- io/ioutil.ReadFile
8-
- io/ioutil.ReadDir
3+
linters:
4+
settings:
5+
errcheck:
6+
check-blank: true
7+
exclude-functions:
8+
- io/ioutil.ReadFile
9+
- io/ioutil.ReadDir
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
errcheck:
5-
check-blank: true
3+
linters:
4+
settings:
5+
errcheck:
6+
check-blank: true
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
errcheck:
5-
check-type-assertions: true
3+
linters:
4+
settings:
5+
errcheck:
6+
check-type-assertions: true

Diff for: pkg/golinters/errchkjson/testdata/errchkjson_check_error_free_encoding.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ version: "2"
33
issues:
44
max-issues-per-linter: 100
55

6-
linters-settings:
7-
errchkjson:
8-
check-error-free-encoding: true
6+
linters:
7+
settings:
8+
errchkjson:
9+
check-error-free-encoding: true
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
errchkjson:
5-
report-no-exported: true
3+
linters:
4+
settings:
5+
errchkjson:
6+
report-no-exported: true
+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
errorlint:
5-
errorf: false
6-
asserts: true
7-
comparison: false
3+
linters:
4+
settings:
5+
errorlint:
6+
errorf: false
7+
asserts: true
8+
comparison: false
+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
errorlint:
5-
errorf: false
6-
asserts: false
7-
comparison: true
3+
linters:
4+
settings:
5+
errorlint:
6+
errorf: false
7+
asserts: false
8+
comparison: true
+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
errorlint:
5-
errorf: true
6-
asserts: false
7-
comparison: false
3+
linters:
4+
settings:
5+
errorlint:
6+
errorf: true
7+
asserts: false
8+
comparison: false
+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
exhaustive:
5-
default-signifies-exhaustive: true
3+
linters:
4+
settings:
5+
exhaustive:
6+
default-signifies-exhaustive: true
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
exhaustive:
5-
ignore-enum-members: "West$"
3+
linters:
4+
settings:
5+
exhaustive:
6+
ignore-enum-members: "West$"
+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
version: "2"
22

3-
linters-settings:
4-
exhaustruct:
5-
include:
6-
- .*\.ExhaustructCustom
7-
exclude:
8-
- .*\.ExhaustructCustom[\d]{1,2}
3+
linters:
4+
settings:
5+
exhaustruct:
6+
include:
7+
- .*\.ExhaustructCustom
8+
exclude:
9+
- .*\.ExhaustructCustom[\d]{1,2}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
fatcontext:
5-
check-struct-pointers: true
6-
3+
linters:
4+
settings:
5+
fatcontext:
6+
check-struct-pointers: true

Diff for: pkg/golinters/forbidigo/testdata/forbidigo.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: "2"
22

3-
linters-settings:
4-
forbidigo:
5-
forbid:
6-
- pattern: fmt\.Print.*
7-
- pattern: time.Sleep(# no sleeping!)?
3+
linters:
4+
settings:
5+
forbidigo:
6+
forbid:
7+
- pattern: fmt\.Print.*
8+
- pattern: time.Sleep(# no sleeping!)?
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
forbidigo:
5-
exclude-godoc-examples: false
6-
3+
linters:
4+
settings:
5+
forbidigo:
6+
exclude-godoc-examples: false
+9-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
version: "2"
22

3-
linters-settings:
4-
forbidigo:
5-
analyze-types: true
6-
forbid:
7-
- pattern: fmt\.Print.*
8-
pkg: ^fmt$
9-
- pattern: time.Sleep
10-
msg: no sleeping!
3+
linters:
4+
settings:
5+
forbidigo:
6+
analyze-types: true
7+
forbid:
8+
- pattern: fmt\.Print.*
9+
pkg: ^fmt$
10+
- pattern: time.Sleep
11+
msg: no sleeping!

Diff for: pkg/golinters/funlen/testdata/funlen.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
version: "2"
22

3-
linters-settings:
4-
funlen:
5-
lines: 20
6-
statements: 10
3+
linters:
4+
settings:
5+
funlen:
6+
lines: 20
7+
statements: 10

Diff for: pkg/golinters/ginkgolinter/testdata/ginkgolinter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//golangcitest:args --disable-all -Eginkgolinter
1+
//golangcitest:args -Eginkgolinter
22
package ginkgolinter
33

44
import (
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
version: "2"
22

3-
linters-settings:
4-
ginkgolinter:
5-
allow-havelen-zero: true
3+
linters:
4+
settings:
5+
ginkgolinter:
6+
allow-havelen-zero: true

Diff for: pkg/golinters/ginkgolinter/testdata/ginkgolinter_cgo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//golangcitest:args --disable-all -Eginkgolinter
1+
//golangcitest:args -Eginkgolinter
22
package testdata
33

44
/*
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
version: "2"
22

3-
linters-settings:
4-
ginkgolinter: {}
3+
linters:
4+
settings:
5+
ginkgolinter: {}

Diff for: pkg/golinters/ginkgolinter/testdata/ginkgolinter_havelen0.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//golangcitest:config_path testdata/ginkgolinter_allow_havelen0.yml
2-
//golangcitest:args --disable-all -Eginkgolinter
2+
//golangcitest:args -Eginkgolinter
33
package ginkgolinter
44

55
import (

0 commit comments

Comments
 (0)