gopls: set GOWORK=off for loads from debug and safetoken tests

findleyr · findleyr · commit d5af8894fe90 · 2023-05-08T19:33:51.000Z
Using -mod=mod when calling go/packages.Load causes tests to fail when GOWORK is set, so set GOWORK=off explicitly. Change-Id: I3b25bd7042c23bfe10223cb466a10e1accaf2ba0 Reviewed-on: https://go-review.googlesource.com/c/tools/+/493615 gopls-CI: kokoro <noreply+kokoro@google.com> Reviewed-by: Alan Donovan <adonovan@google.com> Run-TryBot: Robert Findley <rfindley@google.com> TryBot-Result: Gopher Robot <gobot@golang.org>
diff --git a/gopls/internal/lsp/safetoken/safetoken_test.go b/gopls/internal/lsp/safetoken/safetoken_test.go
@@ -81,6 +81,7 @@ func TestGoplsSourceDoesNotCallTokenFileMethods(t *testing.T) {
 	cfg.Env = os.Environ()
 	cfg.Env = append(cfg.Env,
 		"GOPACKAGESDRIVER=off",
+		"GOWORK=off", // necessary for -mod=mod below
 		"GOFLAGS=-mod=mod",
 	)
 
diff --git a/gopls/test/debug/debug_test.go b/gopls/test/debug/debug_test.go
@@ -54,6 +54,7 @@ func TestTemplates(t *testing.T) {
 	cfg.Env = os.Environ()
 	cfg.Env = append(cfg.Env,
 		"GOPACKAGESDRIVER=off",
+		"GOWORK=off", // necessary for -mod=mod below
 		"GOFLAGS=-mod=mod",
 	)
 

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ func TestGoplsSourceDoesNotCallTokenFileMethods(t *testing.T) {`
`81`	`81`	`cfg.Env = os.Environ()`
`82`	`82`	`cfg.Env = append(cfg.Env,`
`83`	`83`	`"GOPACKAGESDRIVER=off",`
	`84`	`+ "GOWORK=off", // necessary for -mod=mod below`
`84`	`85`	`"GOFLAGS=-mod=mod",`
`85`	`86`	`)`
`86`	`87`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func TestTemplates(t *testing.T) {`
`54`	`54`	`cfg.Env = os.Environ()`
`55`	`55`	`cfg.Env = append(cfg.Env,`
`56`	`56`	`"GOPACKAGESDRIVER=off",`
	`57`	`+ "GOWORK=off", // necessary for -mod=mod below`
`57`	`58`	`"GOFLAGS=-mod=mod",`
`58`	`59`	`)`
`59`	`60`