From 3f7c32638c09af103a99661c2dba5837243fc88b Mon Sep 17 00:00:00 2001 From: Rob Findley Date: Tue, 15 Jun 2021 18:04:27 -0400 Subject: [PATCH] gopls/internal/regtest: skip the flaky TestResolveImportCycle Also improve the description of the failing expectations. Updates golang/go#46773 Change-Id: I9465de8a5005bb7ee719a536f8550afc54bd6044 Reviewed-on: https://go-review.googlesource.com/c/tools/+/328369 Trust: Robert Findley Run-TryBot: Robert Findley gopls-CI: kokoro TryBot-Result: Go Bot Reviewed-by: Rebecca Stambler --- gopls/internal/regtest/diagnostics/diagnostics_test.go | 1 + internal/lsp/regtest/expectation.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gopls/internal/regtest/diagnostics/diagnostics_test.go b/gopls/internal/regtest/diagnostics/diagnostics_test.go index 689ecad63b4..949520111b1 100644 --- a/gopls/internal/regtest/diagnostics/diagnostics_test.go +++ b/gopls/internal/regtest/diagnostics/diagnostics_test.go @@ -1618,6 +1618,7 @@ import _ "mod.com/triple/a" // Tests golang/go#46667: deleting a problematic import path should resolve // import cycle errors. func TestResolveImportCycle(t *testing.T) { + t.Skip("flaky test: see golang/go#46773") const mod = ` -- go.mod -- module mod.test diff --git a/internal/lsp/regtest/expectation.go b/internal/lsp/regtest/expectation.go index bd7649d674e..408bf81a59d 100644 --- a/internal/lsp/regtest/expectation.go +++ b/internal/lsp/regtest/expectation.go @@ -525,7 +525,7 @@ func EmptyDiagnostics(name string) Expectation { } return SimpleExpectation{ check: check, - description: "empty diagnostics", + description: fmt.Sprintf("empty diagnostics for %q", name), } }