diff options
Diffstat (limited to 'gopls/internal/regtest/misc/generate_test.go')
| -rw-r--r-- | gopls/internal/regtest/misc/generate_test.go | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gopls/internal/regtest/misc/generate_test.go b/gopls/internal/regtest/misc/generate_test.go index 1dc22d737..547755fd2 100644 --- a/gopls/internal/regtest/misc/generate_test.go +++ b/gopls/internal/regtest/misc/generate_test.go @@ -12,12 +12,10 @@ package misc import ( "testing" - . "golang.org/x/tools/internal/lsp/regtest" + . "golang.org/x/tools/gopls/internal/lsp/regtest" ) func TestGenerateProgress(t *testing.T) { - t.Skipf("skipping flaky test: https://golang.org/issue/49901") - const generatedWorkspace = ` -- go.mod -- module fake.test @@ -40,12 +38,12 @@ func main() { -- lib1/lib.go -- package lib1 -//go:generate go run ../generate.go lib1 +//` + `go:generate go run ../generate.go lib1 -- lib2/lib.go -- package lib2 -//go:generate go run ../generate.go lib2 +//` + `go:generate go run ../generate.go lib2 -- main.go -- package main @@ -61,15 +59,14 @@ func main() { ` Run(t, generatedWorkspace, func(t *testing.T, env *Env) { - env.Await( - env.DiagnosticAtRegexp("main.go", "lib1.(Answer)"), + env.OnceMet( + InitialWorkspaceLoad, + Diagnostics(env.AtRegexp("main.go", "lib1.(Answer)")), ) env.RunGenerate("./lib1") env.RunGenerate("./lib2") - env.Await( - OnceMet( - env.DoneWithChangeWatchedFiles(), - EmptyDiagnostics("main.go")), + env.AfterChange( + NoDiagnostics(ForFile("main.go")), ) }) } |