From 211dcd1cef82d4dbfb19179d0694fa0dc9207ef1 Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Wed, 3 Oct 2018 17:43:12 -0400 Subject: [PATCH] go/analysis/analysistest: unset GO111MODULE and GOPROXY CL 139320 unset these env vars for the whole process in two tests, but the correct fix is to unset them for subprocesses forked by go/packages. Change-Id: I35e3ab9e424b00326e9e813e4daf0ae92ec36e26 Reviewed-on: https://go-review.googlesource.com/c/139477 Reviewed-by: Bryan C. Mills Run-TryBot: Bryan C. Mills TryBot-Result: Gobot Gobot --- go/analysis/analysistest/analysistest.go | 2 +- go/analysis/passes/findcall/findcall_test.go | 14 -------------- go/analysis/passes/pkgfact/pkgfact_test.go | 14 -------------- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/go/analysis/analysistest/analysistest.go b/go/analysis/analysistest/analysistest.go index 312dfd5b..b5c53c07 100644 --- a/go/analysis/analysistest/analysistest.go +++ b/go/analysis/analysistest/analysistest.go @@ -128,7 +128,7 @@ func loadPackage(dir, pkgpath string) (*packages.Package, error) { Mode: packages.LoadAllSyntax, Dir: dir, Tests: true, - Env: append(os.Environ(), "GOPATH="+dir), + Env: append(os.Environ(), "GOPATH="+dir, "GO111MODULE=off", "GOPROXY=off"), } pkgs, err := packages.Load(cfg, pkgpath) if err != nil { diff --git a/go/analysis/passes/findcall/findcall_test.go b/go/analysis/passes/findcall/findcall_test.go index 105f1a0e..c521885c 100644 --- a/go/analysis/passes/findcall/findcall_test.go +++ b/go/analysis/passes/findcall/findcall_test.go @@ -1,26 +1,12 @@ package findcall_test import ( - "log" - "os" "testing" "golang.org/x/tools/go/analysis/analysistest" "golang.org/x/tools/go/analysis/passes/findcall" ) -func init() { - // This test currently requires GOPATH mode. - // Explicitly disabling module mode should suffix, but - // we'll also turn off GOPROXY just for good measure. - if err := os.Setenv("GO111MODULE", "off"); err != nil { - log.Fatal(err) - } - if err := os.Setenv("GOPROXY", "off"); err != nil { - log.Fatal(err) - } -} - // TestFromStringLiterals demonstrates how to test an analysis using // a table of string literals for each test case. // diff --git a/go/analysis/passes/pkgfact/pkgfact_test.go b/go/analysis/passes/pkgfact/pkgfact_test.go index 511026c0..11e6f893 100644 --- a/go/analysis/passes/pkgfact/pkgfact_test.go +++ b/go/analysis/passes/pkgfact/pkgfact_test.go @@ -1,26 +1,12 @@ package pkgfact_test import ( - "log" - "os" "testing" "golang.org/x/tools/go/analysis/analysistest" "golang.org/x/tools/go/analysis/passes/pkgfact" ) -func init() { - // This test currently requires GOPATH mode. - // Explicitly disabling module mode should suffix, but - // we'll also turn off GOPROXY just for good measure. - if err := os.Setenv("GO111MODULE", "off"); err != nil { - log.Fatal(err) - } - if err := os.Setenv("GOPROXY", "off"); err != nil { - log.Fatal(err) - } -} - func Test(t *testing.T) { testdata := analysistest.TestData() analysistest.Run(t, testdata, pkgfact.Analyzer,