From 70b80623d1eb34f26b8cf214414b78fbe329b8ab Mon Sep 17 00:00:00 2001 From: Alessandro Arzilli Date: Mon, 24 Apr 2023 21:11:50 +0200 Subject: [PATCH] service/dap: fix failing test on Go 1.21 (#3312) --- service/dap/server_test.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/service/dap/server_test.go b/service/dap/server_test.go index cdd4fdc7..09e5bd9b 100644 --- a/service/dap/server_test.go +++ b/service/dap/server_test.go @@ -1920,15 +1920,7 @@ func TestScopesRequestsOptimized(t *testing.T) { client.StackTraceRequest(1, 0, 20) stack := client.ExpectStackTraceResponse(t) - startLineno := 66 - if runtime.GOOS == "windows" && goversion.VersionAfterOrEqual(runtime.Version(), 1, 15) { - // Go1.15 on windows inserts a NOP after the call to - // runtime.Breakpoint and marks it same line as the - // runtime.Breakpoint call, making this flaky, so skip the line check. - startLineno = -1 - } - - checkStackFramesExact(t, stack, "main.foobar", startLineno, 1000, 4, 4) + checkStackFramesExact(t, stack, "main.foobar", -1, 1000, 4, 4) client.ScopesRequest(1000) scopes := client.ExpectScopesResponse(t)