From 938e162bcf3a5ba07fe4dfcac14cb525260db9ed Mon Sep 17 00:00:00 2001 From: Robert Findley Date: Mon, 15 Aug 2022 14:12:52 -0400 Subject: [PATCH] gopls/internal/regtest: unskip TestDeleteModule_Interdependent Reloading has been significantly refactored recently. Unskip this test to see if it flakes: - If it does not flake, that is a useful signal. - If it does flake, that is also a useful signal. Notably, following CL 419500 we allow network when reloading the workspace, and so do not need to apply quick-fixes in order to download the new module from the proxy. For golang/go#46375 For golang/go#53878 Change-Id: Idde7195730c32bdb434a26b28aac82649dd1b5ac Reviewed-on: https://go-review.googlesource.com/c/tools/+/422910 Run-TryBot: Robert Findley TryBot-Result: Gopher Robot Reviewed-by: Peter Weinberger gopls-CI: kokoro --- gopls/internal/regtest/workspace/workspace_test.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gopls/internal/regtest/workspace/workspace_test.go b/gopls/internal/regtest/workspace/workspace_test.go index 86da9d1c938..3e980de95d8 100644 --- a/gopls/internal/regtest/workspace/workspace_test.go +++ b/gopls/internal/regtest/workspace/workspace_test.go @@ -302,8 +302,6 @@ func main() { // This change tests that the version of the module used changes after it has // been deleted from the workspace. func TestDeleteModule_Interdependent(t *testing.T) { - t.Skip("Skipping due to golang/go#46375: race due to orphaned file reloading") - const multiModule = ` -- moda/a/go.mod -- module a.com @@ -353,15 +351,6 @@ func Hello() int { env.DoneWithChangeWatchedFiles(), ) - d := protocol.PublishDiagnosticsParams{} - env.Await( - OnceMet( - env.DiagnosticAtRegexpWithMessage("moda/a/go.mod", "require b.com v1.2.3", "b.com@v1.2.3 has not been downloaded"), - ReadDiagnostics("moda/a/go.mod", &d), - ), - ) - env.ApplyQuickFixes("moda/a/go.mod", d.Diagnostics) - env.Await(env.DoneWithChangeWatchedFiles()) got, _ := env.GoToDefinition("moda/a/a.go", env.RegexpSearch("moda/a/a.go", "Hello")) if want := "b.com@v1.2.3/b/b.go"; !strings.HasSuffix(got, want) { t.Errorf("expected %s, got %v", want, got)