commit 44bcb96178d39510d2bb8a61ef1c08b85bb24a45
author Rebecca Stambler <rstambler@golang.org> Wed Feb 06 17:04:16 2019 -0500
committer Rebecca Stambler <rstambler@golang.org> Wed Feb 06 22:14:03 2019 +0000
tree 933afadd2af5bd085e0ada0595937fb30eff7f55
parent a8576e2603b2bc62c97e830174b002dba60d6a0c

go/packages: fix broken tests to handle changes to packagestest

golang.org/cl/161317 set Tests to true in the packagestest go/packages
Config. Handle this in the go/packages tests.

Fixes golang/go#30115

Change-Id: I6b4c0ca3dc2d73855239f3e7122e29da6ce81657
Reviewed-on: https://go-review.googlesource.com/c/161457
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>

go/packages/packages_test.go

diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go
index c27e940..6465dd3 100644
--- a/go/packages/packages_test.go
+++ b/go/packages/packages_test.go
@@ -99,6 +99,10 @@
 * golang.org/fake/c
 * golang.org/fake/e
 * golang.org/fake/subdir/d
+* golang.org/fake/subdir/d [golang.org/fake/subdir/d.test]
+* golang.org/fake/subdir/d.test
+* golang.org/fake/subdir/d_test [golang.org/fake/subdir/d.test]
+  math/bits
   unsafe
   golang.org/fake/b -> errors
   golang.org/fake/b -> golang.org/fake/a
@@ -106,6 +110,13 @@
   golang.org/fake/c -> unsafe
   golang.org/fake/e -> golang.org/fake/b
   golang.org/fake/e -> golang.org/fake/c
+  golang.org/fake/subdir/d [golang.org/fake/subdir/d.test] -> math/bits
+  golang.org/fake/subdir/d.test -> golang.org/fake/subdir/d [golang.org/fake/subdir/d.test]
+  golang.org/fake/subdir/d.test -> golang.org/fake/subdir/d_test [golang.org/fake/subdir/d.test]
+  golang.org/fake/subdir/d.test -> os (pruned)
+  golang.org/fake/subdir/d.test -> testing (pruned)
+  golang.org/fake/subdir/d.test -> testing/internal/testdeps (pruned)
+  golang.org/fake/subdir/d_test [golang.org/fake/subdir/d.test] -> golang.org/fake/subdir/d [golang.org/fake/subdir/d.test]
 `[1:]
 
 	if graph != wantGraph {
@@ -1268,7 +1279,10 @@
 		}}})
 	defer exported.Cleanup()
 
-	initial, err := packages.Load(exported.Config, "errors", "iamashamedtousethedisabledqueryname=errors")
+	cfg := *exported.Config
+	cfg.Tests = false
+
+	initial, err := packages.Load(&cfg, "errors", "iamashamedtousethedisabledqueryname=errors")
 	if err != nil {
 		t.Fatal(err)
 	}