From 44bcb96178d39510d2bb8a61ef1c08b85bb24a45 Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Wed, 6 Feb 2019 17:04:16 -0500 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Michael Matloob --- go/packages/packages_test.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go index c27e940a30..6465dd3813 100644 --- a/go/packages/packages_test.go +++ b/go/packages/packages_test.go @@ -99,6 +99,10 @@ func testLoadImportsGraph(t *testing.T, exporter packagestest.Exporter) { * 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 @@ func testLoadImportsGraph(t *testing.T, exporter packagestest.Exporter) { 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 @@ func testRedundantQueries(t *testing.T, exporter packagestest.Exporter) { }}}) 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) }