commit 680468b7556f697577414fb99a2dbdcb97626720
author Michael Matloob <matloob@golang.org> Fri Nov 09 16:24:45 2018 -0500
committer Brad Fitzpatrick <bradfitz@golang.org> Mon Nov 12 16:24:42 2018 +0000
tree 6aaed4682b747cb85cec3e29e87f6ee9099595f1
parent 6d71ab8aade08605ffc36622332264e2f6991952

go/packages: fix flaky TestJSON and reenable it on Go 1.10

The fallback driver wasn't returning the roots in a
deterministic order because it was using sticking them in
a map and then iterating over that map to get each element.
Put them into a slice instead (and make a few small
associated changes) to preserve behavior.

Fixes golang/go#28040
Fixes golang/go#28609

Change-Id: Ib8f8c88d65b7a48b2b04ca91e2d3c316d5bb5803
Reviewed-on: https://go-review.googlesource.com/c/148880
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

go/packages/golist_fallback.go

diff --git a/go/packages/golist_fallback.go b/go/packages/golist_fallback.go
index 0989401..8e88607 100644
--- a/go/packages/golist_fallback.go
+++ b/go/packages/golist_fallback.go
@@ -46,7 +46,7 @@
 
 	var response driverResponse
 	allPkgs := make(map[string]bool)
-	addPackage := func(p *jsonPackage) {
+	addPackage := func(p *jsonPackage, isRoot bool) {
 		id := p.ImportPath
 
 		if allPkgs[id] {
@@ -54,7 +54,6 @@
 		}
 		allPkgs[id] = true
 
-		isRoot := original[id] != nil
 		pkgpath := id
 
 		if pkgpath == "unsafe" {
@@ -221,7 +220,7 @@
 	}
 
 	for _, pkg := range original {
-		addPackage(pkg)
+		addPackage(pkg, true)
 	}
 	if cfg.Mode < LoadImports || len(deps) == 0 {
 		return &response, nil
@@ -239,7 +238,7 @@
 			return nil, fmt.Errorf("JSON decoding failed: %v", err)
 		}
 
-		addPackage(p)
+		addPackage(p, false)
 	}
 
 	for _, v := range needsTestVariant {
@@ -356,14 +355,13 @@
 }
 
 // getDeps runs an initial go list to determine all the dependency packages.
-func getDeps(cfg *Config, words ...string) (originalSet map[string]*jsonPackage, deps []string, err error) {
+func getDeps(cfg *Config, words ...string) (initial []*jsonPackage, deps []string, err error) {
 	buf, err := invokeGo(cfg, golistArgsFallback(cfg, words)...)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	depsSet := make(map[string]bool)
-	originalSet = make(map[string]*jsonPackage)
 	var testImports []string
 
 	// Extract deps from the JSON.
@@ -373,7 +371,7 @@
 			return nil, nil, fmt.Errorf("JSON decoding failed: %v", err)
 		}
 
-		originalSet[p.ImportPath] = p
+		initial = append(initial, p)
 		for _, dep := range p.Deps {
 			depsSet[dep] = true
 		}
@@ -407,8 +405,8 @@
 		}
 	}
 
-	for orig := range originalSet {
-		delete(depsSet, orig)
+	for _, orig := range initial {
+		delete(depsSet, orig.ImportPath)
 	}
 
 	deps = make([]string, 0, len(depsSet))
@@ -416,7 +414,7 @@
 		deps = append(deps, dep)
 	}
 	sort.Strings(deps) // ensure output is deterministic
-	return originalSet, deps, nil
+	return initial, deps, nil
 }
 
 func golistArgsFallback(cfg *Config, words []string) []string {

go/packages/packages_test.go

diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go
index 9b096fc..5f6c2eb 100644
--- a/go/packages/packages_test.go
+++ b/go/packages/packages_test.go
@@ -9,7 +9,6 @@
 	"encoding/json"
 	"fmt"
 	"go/ast"
-	"go/build"
 	constantpkg "go/constant"
 	"go/parser"
 	"go/token"
@@ -1222,9 +1221,6 @@
 
 func TestJSON(t *testing.T) { packagestest.TestAll(t, testJSON) }
 func testJSON(t *testing.T, exporter packagestest.Exporter) {
-	if !haveReleaseTag("go1.11") {
-		t.Skip("skipping; flaky before Go 1.11; https://golang.org/issue/28609")
-	}
 	//TODO: add in some errors
 	exported := packagestest.Export(t, exporter, []packagestest.Module{{
 		Name: "golang.org/fake",
@@ -1637,12 +1633,3 @@
 	}
 	return c.(*types.Const)
 }
-
-func haveReleaseTag(tag string) bool {
-	for _, v := range build.Default.ReleaseTags {
-		if tag == v {
-			return true
-		}
-	}
-	return false
-}