chore: remove github.com/pkg/errors inside tests

ldez · ldez · commit 4acedd40f134 · 2023-02-27T22:04:14.000+01:00
diff --git a/.golangci.reference.yml b/.golangci.reference.yml
@@ -75,7 +75,7 @@ run:
 
 # output configuration options
 output:
-  # Format: colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions
+  # Format: colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions|teamcity
   #
   # Multiple can be specified by separating them by comma, output can be provided
   # for each of them by separating format name and path by colon symbol.
diff --git a/test/testdata/configs/importas.yml b/test/testdata/configs/importas.yml
@@ -5,5 +5,5 @@ linters-settings:
         alias: fff
       - pkg: os
         alias: std_os
-      - pkg: github.com/pkg/errors
-        alias: pkgerr
+      - pkg: golang.org/x/tools/go/analysis
+        alias: ananas
diff --git a/test/testdata/configs/importas_strict.yml b/test/testdata/configs/importas_strict.yml
@@ -6,5 +6,5 @@ linters-settings:
         alias: fff
       - pkg: os
         alias: std_os
-      - pkg: github.com/pkg/errors
-        alias: pkgerr
+      - pkg: golang.org/x/tools/go/analysis
+        alias: ananas
diff --git a/test/testdata/fix/in/gci.go b/test/testdata/fix/in/gci.go
@@ -5,12 +5,12 @@ package gci
 
 import (
 	"github.com/golangci/golangci-lint/pkg/config"
-	"github.com/pkg/errors"
+	"golang.org/x/tools/go/analysis"
 	"fmt"
 )
 
 func GoimportsLocalTest() {
 	fmt.Print("x")
 	_ = config.Config{}
-	_ = errors.New("")
+	_ = analysis.Analyzer{}
 }
diff --git a/test/testdata/fix/out/gci.go b/test/testdata/fix/out/gci.go
@@ -6,13 +6,13 @@ package gci
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
+	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 )
 
 func GoimportsLocalTest() {
 	fmt.Print("x")
 	_ = config.Config{}
-	_ = errors.New("")
+	_ = analysis.Analyzer{}
 }
diff --git a/test/testdata/gci.go b/test/testdata/gci.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/golangci/golangci-lint/pkg/config" // want "File is not \\`gci\\`-ed with --skip-generated -s standard,prefix\\(github.com/golangci/golangci-lint\\),default"
 
-	"github.com/pkg/errors" // want "File is not \\`gci\\`-ed with --skip-generated -s standard,prefix\\(github.com/golangci/golangci-lint\\),default"
+	"golang.org/x/tools/go/analysis" // want "File is not \\`gci\\`-ed with --skip-generated -s standard,prefix\\(github.com/golangci/golangci-lint\\),default"
 )
 
 func GoimportsLocalTest() {
 	fmt.Print("x")
 	_ = config.Config{}
-	_ = errors.New("")
+	_ = analysis.Analyzer{}
 }
diff --git a/test/testdata/goimports_local.go b/test/testdata/goimports_local.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 
 	"github.com/golangci/golangci-lint/pkg/config" // want "File is not `goimports`-ed with -local github.com/golangci/golangci-lint"
-	"github.com/pkg/errors"
+	"golang.org/x/tools/go/analysis"
 )
 
 func GoimportsLocalPrefixTest() {
 	fmt.Print("x")
 	_ = config.Config{}
-	_ = errors.New("")
+	_ = analysis.Analyzer{}
 }
diff --git a/test/testdata/importas.go b/test/testdata/importas.go
@@ -7,12 +7,12 @@ import (
 	"os"
 	wrong_alias_again "os" // want `import "os" imported as "wrong_alias_again" but must be "std_os" according to config`
 
-	wrong "github.com/pkg/errors" // want `import "github.com/pkg/errors" imported as "wrong" but must be "pkgerr" according to config`
+	wrong "golang.org/x/tools/go/analysis" // want `import "golang.org/x/tools/go/analysis" imported as "wrong" but must be "ananas" according to config`
 )
 
 func ImportAsWrongAlias() {
 	wrong_alias.Println("foo")
 	wrong_alias_again.Stdout.WriteString("bar")
 	os.Stdout.WriteString("test")
-	_ = wrong.New("baz")
+	_ = wrong.Analyzer{}
 }
diff --git a/test/testdata/importas_strict.go b/test/testdata/importas_strict.go
@@ -7,12 +7,12 @@ import (
 	"os"                   // want `import "os" imported without alias but must be with alias "std_os" according to config`
 	wrong_alias_again "os" // want `import "os" imported as "wrong_alias_again" but must be "std_os" according to config`
 
-	wrong "github.com/pkg/errors" // want `import "github.com/pkg/errors" imported as "wrong" but must be "pkgerr" according to config`
+	wrong "golang.org/x/tools/go/analysis" // want `import "golang.org/x/tools/go/analysis" imported as "wrong" but must be "ananas" according to config`
 )
 
 func ImportAsStrictWrongAlias() {
 	wrong_alias.Println("foo")
 	wrong_alias_again.Stdout.WriteString("bar")
 	os.Stdout.WriteString("test")
-	_ = wrong.New("baz")
+	_ = wrong.Analyzer{}
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ run:`
`75`	`75`
`76`	`76`	`# output configuration options`
`77`	`77`	`output:`
`78`		`- # Format: colored-line-number\|line-number\|json\|tab\|checkstyle\|code-climate\|junit-xml\|github-actions`
	`78`	`+ # Format: colored-line-number\|line-number\|json\|tab\|checkstyle\|code-climate\|junit-xml\|github-actions\|teamcity`
`79`	`79`	`#`
`80`	`80`	`# Multiple can be specified by separating them by comma, output can be provided`
`81`	`81`	`# for each of them by separating format name and path by colon symbol.`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ package gci`
`5`	`5`
`6`	`6`	`import (`
`7`	`7`	`"github.com/golangci/golangci-lint/pkg/config"`
`8`		`- "github.com/pkg/errors"`
	`8`	`+ "golang.org/x/tools/go/analysis"`
`9`	`9`	`"fmt"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func GoimportsLocalTest() {`
`13`	`13`	`fmt.Print("x")`
`14`	`14`	`_ = config.Config{}`
`15`		`- _ = errors.New("")`
	`15`	`+ _ = analysis.Analyzer{}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@ package gci`
`6`	`6`	`import (`
`7`	`7`	`"fmt"`
`8`	`8`
`9`		`- "github.com/pkg/errors"`
	`9`	`+ "golang.org/x/tools/go/analysis"`
`10`	`10`
`11`	`11`	`"github.com/golangci/golangci-lint/pkg/config"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func GoimportsLocalTest() {`
`15`	`15`	`fmt.Print("x")`
`16`	`16`	`_ = config.Config{}`
`17`		`- _ = errors.New("")`
	`17`	`+ _ = analysis.Analyzer{}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ import (`
`7`	`7`
`8`	`8`	"github.com/golangci/golangci-lint/pkg/config" // want "File is not \\`gci\\`-ed with --skip-generated -s standard,prefix\\(github.com/golangci/golangci-lint\\),default"
`9`	`9`
`10`		- "github.com/pkg/errors" // want "File is not \\`gci\\`-ed with --skip-generated -s standard,prefix\\(github.com/golangci/golangci-lint\\),default"
	`10`	+ "golang.org/x/tools/go/analysis" // want "File is not \\`gci\\`-ed with --skip-generated -s standard,prefix\\(github.com/golangci/golangci-lint\\),default"
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func GoimportsLocalTest() {`
`14`	`14`	`fmt.Print("x")`
`15`	`15`	`_ = config.Config{}`
`16`		`- _ = errors.New("")`
	`16`	`+ _ = analysis.Analyzer{}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`
`8`	`8`	"github.com/golangci/golangci-lint/pkg/config" // want "File is not `goimports`-ed with -local github.com/golangci/golangci-lint"
`9`		`- "github.com/pkg/errors"`
	`9`	`+ "golang.org/x/tools/go/analysis"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func GoimportsLocalPrefixTest() {`
`13`	`13`	`fmt.Print("x")`
`14`	`14`	`_ = config.Config{}`
`15`		`- _ = errors.New("")`
	`15`	`+ _ = analysis.Analyzer{}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ import (`
`7`	`7`	`"os"`
`8`	`8`	wrong_alias_again "os" // want `import "os" imported as "wrong_alias_again" but must be "std_os" according to config`
`9`	`9`
`10`		- wrong "github.com/pkg/errors" // want `import "github.com/pkg/errors" imported as "wrong" but must be "pkgerr" according to config`
	`10`	+ wrong "golang.org/x/tools/go/analysis" // want `import "golang.org/x/tools/go/analysis" imported as "wrong" but must be "ananas" according to config`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func ImportAsWrongAlias() {`
`14`	`14`	`wrong_alias.Println("foo")`
`15`	`15`	`wrong_alias_again.Stdout.WriteString("bar")`
`16`	`16`	`os.Stdout.WriteString("test")`
`17`		`- _ = wrong.New("baz")`
	`17`	`+ _ = wrong.Analyzer{}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ import (`
`7`	`7`	"os" // want `import "os" imported without alias but must be with alias "std_os" according to config`
`8`	`8`	wrong_alias_again "os" // want `import "os" imported as "wrong_alias_again" but must be "std_os" according to config`
`9`	`9`
`10`		- wrong "github.com/pkg/errors" // want `import "github.com/pkg/errors" imported as "wrong" but must be "pkgerr" according to config`
	`10`	+ wrong "golang.org/x/tools/go/analysis" // want `import "golang.org/x/tools/go/analysis" imported as "wrong" but must be "ananas" according to config`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func ImportAsStrictWrongAlias() {`
`14`	`14`	`wrong_alias.Println("foo")`
`15`	`15`	`wrong_alias_again.Stdout.WriteString("bar")`
`16`	`16`	`os.Stdout.WriteString("test")`
`17`		`- _ = wrong.New("baz")`
	`17`	`+ _ = wrong.Analyzer{}`
`18`	`18`	`}`