Skip to content

Commit eb2fcc3

Browse files
committed
internal/tests/deps: add more information to error message
For golang/go#64807 Change-Id: Ie2b95ccf0c77ceb8d4a138a767937e3751db7a76 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/553516 LUCI-TryBot-Result: Go LUCI <[email protected]> Run-TryBot: Michael Matloob <[email protected]> Reviewed-by: Jonathan Amsterdam <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Bryan Mills <[email protected]> kokoro-CI: kokoro <[email protected]>
1 parent e232f56 commit eb2fcc3

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

internal/tests/deps/cmd_pkgsite_deps_test.go

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,13 @@ var additionalAllowedTestModDeps = map[string]bool{
3131

3232
func TestCmdPkgsiteDeps(t *testing.T) {
3333
// First, list all dependencies of pkgsite.
34-
out, err := exec.Command("go", "list", "-deps", "golang.org/x/pkgsite/cmd/pkgsite").Output()
34+
out, err := exec.Command("go", "list", "-e", "-deps", "golang.org/x/pkgsite/cmd/pkgsite").Output()
3535
if err != nil {
36-
t.Fatal("running go list: ", err)
36+
if ee, ok := err.(*exec.ExitError); ok && len(ee.Stderr) > 0 {
37+
t.Fatalf("running go list -test -deps on package golang.org/x/pkgsite/cmd/pkgsite:\n%s", ee.Stderr)
38+
}
39+
t.Fatalf("running go list -test -deps on package golang.org/x/pkgsite/cmd/pkgsite: %v", err)
40+
3741
}
3842
pkgs := strings.Fields(string(out))
3943
for _, pkg := range pkgs {
@@ -43,9 +47,12 @@ func TestCmdPkgsiteDeps(t *testing.T) {
4347
}
4448

4549
// Get the test module deps and check them against allowedTestModDeps.
46-
out, err := exec.Command("go", "list", "-deps", "-test", "-f", "{{if .Module}}{{.Module.Path}}{{end}}", pkg).Output()
50+
out, err := exec.Command("go", "list", "-e", "-deps", "-test", "-f", "{{if .Module}}{{.Module.Path}}{{end}}", pkg).Output()
4751
if err != nil {
48-
t.Fatal(err)
52+
if ee, ok := err.(*exec.ExitError); ok && len(ee.Stderr) > 0 {
53+
t.Fatalf("running go list -test -deps on package %s:\n%s", pkg, ee.Stderr)
54+
}
55+
t.Fatalf("running go list -test -deps on package %s: %v", pkg, err)
4956
}
5057
testmodules := strings.Fields(string(out))
5158
for _, m := range testmodules {
@@ -55,9 +62,12 @@ func TestCmdPkgsiteDeps(t *testing.T) {
5562
}
5663

5764
// Get the module deps and check them against allowedModDeps
58-
out, err = exec.Command("go", "list", "-deps", "-f", "{{if .Module}}{{.Module.Path}}{{end}}", pkg).Output()
65+
out, err = exec.Command("go", "list", "-e", "-deps", "-f", "{{if .Module}}{{.Module.Path}}{{end}}", pkg).Output()
5966
if err != nil {
60-
t.Fatal(err)
67+
if ee, ok := err.(*exec.ExitError); ok && len(ee.Stderr) > 0 {
68+
t.Fatalf("running go list -deps on package %s:\n%s", pkg, ee.Stderr)
69+
}
70+
t.Fatalf("running go list -deps on package %s: %v", pkg, err)
6171
}
6272
modules := strings.Fields(string(out))
6373
for _, m := range modules {

0 commit comments

Comments
 (0)