Skip to content

Commit

Permalink
cmd/go/internal/modfetch: fix GOSUMDB test failures
Browse files Browse the repository at this point in the history
Use cfg.GOSUMDB consistently instead of re-resolving it from the environment.

Set cfg.GOSUMDB to 'off' explicitly in coderepo_test, since it may
include modules that cannot be fetched using a released version of the
'go' command.

Fixes #31964

Change-Id: I17cae9e0c6aa1168ba534e6da4e3652800ac81e5
Reviewed-on: https://go-review.googlesource.com/c/go/+/176538
Run-TryBot: Bryan C. Mills <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Jay Conrod <[email protected]>
  • Loading branch information
Bryan C. Mills committed May 13, 2019
1 parent db2bf15 commit 5f320f9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions src/cmd/go/internal/modfetch/coderepo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"testing"
"time"

"cmd/go/internal/cfg"
"cmd/go/internal/modfetch/codehost"
)

Expand All @@ -26,6 +27,12 @@ func TestMain(m *testing.M) {
func testMain(m *testing.M) int {
SetProxy("direct")

// The sum database is populated using a released version of the go command,
// but this test may include fixes for additional modules that previously
// could not be fetched. Since this test isn't executing any of the resolved
// code, bypass the sum database.
cfg.GOSUMDB = "off"

dir, err := ioutil.TempDir("", "gitrepo-test-")
if err != nil {
log.Fatal(err)
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/go/internal/modfetch/sumdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func dbDial() (dbName string, db *sumweb.Conn, err error) {
// $GOSUMDB can be "key" or "key url",
// and the key can be a full verifier key
// or a host on our list of known keys.
key := strings.Fields(cfg.Getenv("GOSUMDB"))
key := strings.Fields(cfg.GOSUMDB)
if len(key) >= 1 {
if k := knownGOSUMDB[key[0]]; k != "" {
key[0] = k
Expand Down

0 comments on commit 5f320f9

Please sign in to comment.