qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 11:54:54 -07:00
Code Releases Activity

cmd/go/internal/modfetch: fix GOSUMDB test failures

Browse Source 
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 <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
This commit is contained in:
Bryan C. Mills 2019-05-10 15:26:56 -04:00
parent db2bf154cc
commit 5f320f962b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/go/internal/modfetch/coderepo_test.go
View File

@ -16,6 +16,7 @@ import (
"testing"
"time"
"cmd/go/internal/cfg"
"cmd/go/internal/modfetch/codehost"
)
@ -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)

2
src/cmd/go/internal/modfetch/sumdb.go
View File

@ -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