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 <rfindley@google.com> Run-TryBot: Robert Findley <rfindley@google.com> gopls-CI: kokoro <noreply+kokoro@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Rebecca Stambler <rstambler@golang.org>
golang · Jun 16, 2021 · 3f7c326 · 3f7c326
1 parent b12e617
commit 3f7c326
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -525,7 +525,7 @@ func EmptyDiagnostics(name string) Expectation {
 	}
 	return SimpleExpectation{
 		check:       check,
-		description: "empty diagnostics",
+		description: fmt.Sprintf("empty diagnostics for %q", name),
 	}
 }