qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 08:24:44 -07:00
Code Releases Activity

cmd/fiximports: fix 'go list' error formatting

Browse Source 
Error positions should be printed, when specified.

Also, made main_test less picky about whitespace before and after
error output.

After this change, the test for cmd/fiximports should pass before and
after CL 210938.

Updates golang/go#36087

Change-Id: I681d1ee07f7f19a0d9716b88678e2737f4c691de
Reviewed-on: https://go-review.googlesource.com/c/tools/+/211337
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
This commit is contained in:
Jay Conrod 2019-12-13 15:54:30 -05:00
parent 38570b7665
commit 210e553fe1
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/fiximports/main.go
View File

@ -205,7 +205,7 @@ func fiximports(packages ...string) bool {
strings.Contains(msg, "expects import") { strings.Contains(msg, "expects import") {
// don't show the very errors we're trying to fix // don't show the very errors we're trying to fix
} else { } else {
fmt.Fprintln(stderr, msg) fmt.Fprintln(stderr, p.Error)
} }
} }
@ -467,6 +467,13 @@ type packageError struct {
Err string // the error itself Err string // the error itself
} }
func (e packageError) Error() string {
if e.Pos != "" {
return e.Pos + ": " + e.Err
}
return e.Err
}
// list runs 'go list' with the specified arguments and returns the // list runs 'go list' with the specified arguments and returns the
// metadata for matching packages. // metadata for matching packages.
func list(args ...string) ([]*listPackage, error) { func list(args ...string) ([]*listPackage, error) {

7
cmd/fiximports/main_test.go
View File

@ -212,6 +212,7 @@ import (
test.wantStderr = strings.Replace(test.wantStderr, `testdata/src/old.com/bad/bad.go`, `testdata\src\old.com\bad\bad.go`, -1) test.wantStderr = strings.Replace(test.wantStderr, `testdata/src/old.com/bad/bad.go`, `testdata\src\old.com\bad\bad.go`, -1)
test.wantStderr = strings.Replace(test.wantStderr, `testdata/src/fruit.io/banana/banana.go`, `testdata\src\fruit.io\banana\banana.go`, -1) test.wantStderr = strings.Replace(test.wantStderr, `testdata/src/fruit.io/banana/banana.go`, `testdata\src\fruit.io\banana\banana.go`, -1)
} }
test.wantStderr = strings.TrimSpace(test.wantStderr)
// Check status code. // Check status code.
if fiximports(test.packages...) != test.wantOK { if fiximports(test.packages...) != test.wantOK {
@ -219,12 +220,12 @@ import (
} }
// Compare stderr output. // Compare stderr output.
if got := stderr.(*bytes.Buffer).String(); got != test.wantStderr { if got := strings.TrimSpace(stderr.(*bytes.Buffer).String()); got != test.wantStderr {
if strings.Contains(got, "vendor/golang_org/x/text/unicode/norm") { if strings.Contains(got, "vendor/golang_org/x/text/unicode/norm") {
t.Skip("skipping known-broken test; see golang.org/issue/17417") t.Skip("skipping known-broken test; see golang.org/issue/17417")
} }
t.Errorf("#%d. stderr: got <<%s>>, want <<%s>>", t.Errorf("#%d. stderr: got <<\n%s\n>>, want <<\n%s\n>>",
i, stderr, test.wantStderr) i, got, test.wantStderr)
} }
// Compare rewrites. // Compare rewrites.