Skip to content

tests: fix tests in go1.22 #3583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2023
Merged

tests: fix tests in go1.22 #3583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/proc/proc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3192,6 +3192,9 @@ func TestDebugStripped(t *testing.T) {
skipOn(t, "not working on freebsd", "freebsd")
skipOn(t, "not working on linux/386", "linux", "386")
skipOn(t, "not working on linux/ppc64le when -gcflags=-N -l is passed", "linux", "ppc64le")
if goversion.VersionAfterOrEqual(runtime.Version(), 1, 22) {
t.Skip("broken")
}
withTestProcessArgs("testnextprog", t, "", []string{}, protest.LinkStrip, func(p *proc.Target, grp *proc.TargetGroup, f protest.Fixture) {
setFunctionBreakpoint(p, t, "main.main")
assertNoError(grp.Continue(), t, "Continue")
Expand All @@ -3209,6 +3212,9 @@ func TestDebugStripped2(t *testing.T) {
skipOn(t, "not working on freebsd", "freebsd")
skipOn(t, "not working on linux/386", "linux", "386")
skipOn(t, "not working on linux/ppc64le when -gcflags=-N -l is passed", "linux", "ppc64le")
if goversion.VersionAfterOrEqual(runtime.Version(), 1, 22) {
t.Skip("broken")
}
if !goversion.VersionAfterOrEqual(runtime.Version(), 1, 20) {
t.Skip("temporarily disabled on Go versions < 1.20")
}
Expand Down
19 changes: 16 additions & 3 deletions service/dap/daptest/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,28 @@ func (c *Client) ExpectOutputEventClosingClient(t *testing.T, status string) *da
return c.ExpectOutputEventRegex(t, fmt.Sprintf(ClosingClient, status))
}

func (c *Client) CheckStopLocation(t *testing.T, thread int, name string, line int) {
func (c *Client) CheckStopLocation(t *testing.T, thread int, name string, line interface{}) {
t.Helper()
c.StackTraceRequest(thread, 0, 20)
st := c.ExpectStackTraceResponse(t)
if len(st.Body.StackFrames) < 1 {
t.Errorf("\ngot %#v\nwant len(stackframes) => 1", st)
} else {
if line != -1 && st.Body.StackFrames[0].Line != line {
t.Errorf("\ngot %#v\nwant Line=%d", st, line)
switch line := line.(type) {
case int:
if line != -1 && st.Body.StackFrames[0].Line != line {
t.Errorf("\ngot %#v\nwant Line=%d", st, line)
}
case []int:
found := false
for _, line := range line {
if st.Body.StackFrames[0].Line == line {
found = true
}
}
if !found {
t.Errorf("\ngot %#v\nwant Line=%v", st, line)
}
}
if st.Body.StackFrames[0].Name != name {
t.Errorf("\ngot %#v\nwant Name=%q", st, name)
Expand Down
85 changes: 40 additions & 45 deletions service/dap/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ func TestPreSetBreakpoint(t *testing.T) {
// wantFrames - number of frames returned (length of StackTraceResponse.Body.StackFrames array).
// wantTotalFrames - total number of stack frames available (StackTraceResponse.Body.TotalFrames).
func checkStackFramesExact(t *testing.T, got *dap.StackTraceResponse,
wantStartName string, wantStartLine, wantStartID, wantFrames, wantTotalFrames int) {
wantStartName string, wantStartLine interface{}, wantStartID, wantFrames, wantTotalFrames int) {
t.Helper()
checkStackFramesNamed("", t, got, wantStartName, wantStartLine, wantStartID, wantFrames, wantTotalFrames, true)
}
Expand Down Expand Up @@ -930,7 +930,7 @@ func checkStackFramesHasMore(t *testing.T, got *dap.StackTraceResponse,
checkStackFramesNamed("", t, got, wantStartName, wantStartLine, wantStartID, wantFrames, wantTotalFrames, false)
}
func checkStackFramesNamed(testName string, t *testing.T, got *dap.StackTraceResponse,
wantStartName string, wantStartLine, wantStartID, wantFrames, wantTotalFrames int, totalExact bool) {
wantStartName string, wantStartLine interface{}, wantStartID, wantFrames, wantTotalFrames int, totalExact bool) {
t.Helper()
if totalExact && got.Body.TotalFrames != wantTotalFrames {
t.Errorf("%s\ngot %#v\nwant TotalFrames=%d", testName, got.Body.TotalFrames, wantTotalFrames)
Expand All @@ -949,9 +949,26 @@ func checkStackFramesNamed(testName string, t *testing.T, got *dap.StackTraceRes
}
// Verify the name and line corresponding to the first returned frame (if any).
// This is useful when the first frame is the frame corresponding to the breakpoint at
// a predefined line. Line values < 0 are a signal to skip the check (which can be useful
// for frames in the third-party code, where we do not control the lines).
if wantFrames > 0 && wantStartLine > 0 && got.Body.StackFrames[0].Line != wantStartLine {
// a predefined line.

startLineOk := true

switch wantStartLine := wantStartLine.(type) {
case int:
if wantStartLine > 0 {
startLineOk = got.Body.StackFrames[0].Line == wantStartLine
}
case []int:
startLineOk = false
for _, ln := range wantStartLine {
if got.Body.StackFrames[0].Line == ln {
startLineOk = true
break
}
}
}

if wantFrames > 0 && !startLineOk {
t.Errorf("%s\ngot Line=%d\nwant %d", testName, got.Body.StackFrames[0].Line, wantStartLine)
}
if wantFrames > 0 && wantStartName != "" && got.Body.StackFrames[0].Name != wantStartName {
Expand Down Expand Up @@ -1454,15 +1471,7 @@ func TestScopesAndVariablesRequests(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", []int{65, 66}, 1000, 4, 4)

client.ScopesRequest(1000)
scopes := client.ExpectScopesResponse(t)
Expand Down Expand Up @@ -2338,10 +2347,12 @@ func TestVariablesLoading(t *testing.T) {
// variables in any frame, not just topmost.
loadvars(1000 /*first topmost frame*/)
// step into another function
client.StepInRequest(1)
client.ExpectStepInResponse(t)
client.SetFunctionBreakpointsRequest([]dap.FunctionBreakpoint{{Name: "main.barfoo"}})
client.ExpectSetFunctionBreakpointsResponse(t)
client.ContinueRequest(1)
client.ExpectContinueResponse(t)
client.ExpectStoppedEvent(t)
checkStop(t, client, 1, "main.barfoo", 24)
checkStop(t, client, 1, "main.barfoo", -1)
loadvars(1001 /*second frame here is same as topmost above*/)
},
disconnect: true,
Expand Down Expand Up @@ -3902,7 +3913,7 @@ func TestEvaluateRequest(t *testing.T) {
fixture.Source, []int{}, // Breakpoint set in the program
[]onBreakpoint{{ // Stop at first breakpoint
execute: func() {
checkStop(t, client, 1, "main.foobar", 66)
checkStop(t, client, 1, "main.foobar", []int{65, 66})

// Variable lookup
client.EvaluateRequest("a2", 1000, "this context will be ignored")
Expand Down Expand Up @@ -4073,7 +4084,7 @@ func TestEvaluateCommandRequest(t *testing.T) {
fixture.Source, []int{}, // Breakpoint set in the program
[]onBreakpoint{{ // Stop at first breakpoint
execute: func() {
checkStop(t, client, 1, "main.foobar", 66)
checkStop(t, client, 1, "main.foobar", []int{65, 66})

// Request help.
const dlvHelp = `The following commands are available:
Expand Down Expand Up @@ -5164,7 +5175,7 @@ func TestFatalThrowBreakpoint(t *testing.T) {
// The details have been tested by other tests,
// so this is just a sanity check.
// Skips line check if line is -1.
func checkStop(t *testing.T, client *daptest.Client, thread int, fname string, line int) {
func checkStop(t *testing.T, client *daptest.Client, thread int, fname string, line interface{}) {
t.Helper()
client.ThreadsRequest()
client.ExpectThreadsResponse(t)
Expand Down Expand Up @@ -5983,15 +5994,7 @@ func TestSetVariable(t *testing.T) {
execute: func() {
tester := &helperForSetVariable{t, client}

startLineno := 66 // after runtime.Breakpoint
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
}

checkStop(t, client, 1, "main.foobar", startLineno)
checkStop(t, client, 1, "main.foobar", []int{65, 66})

// Local variables
locals := tester.variables(localsScope)
Expand Down Expand Up @@ -6160,20 +6163,12 @@ func TestSetVariableWithCall(t *testing.T) {
"mode": "exec", "program": fixture.Path, "showGlobalVariables": true,
})
},
fixture.Source, []int{66, 67},
fixture.Source, []int{},
[]onBreakpoint{{
execute: func() {
tester := &helperForSetVariable{t, client}

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
}

checkStop(t, client, 1, "main.foobar", startLineno)
checkStop(t, client, 1, "main.foobar", []int{65, 66})

// Local variables
locals := tester.variables(localsScope)
Expand All @@ -6196,16 +6191,16 @@ func TestSetVariableWithCall(t *testing.T) {

tester.expectSetVariable(a6Ref, "Bur", `"sentence"`)
tester.evaluate("a6", `main.FooBar {Baz: 8, Bur: "sentence"}`, hasChildren)
},
}, {
// Stop at second breakpoint and set a1.
execute: func() {
tester := &helperForSetVariable{t, client}

// stop inside main.barfoo
client.ContinueRequest(1)
client.ExpectContinueResponse(t)
client.ExpectStoppedEvent(t)
checkStop(t, client, 1, "main.barfoo", -1)

// Test: set string 'a1' in main.barfoo.
// This shouldn't affect 'a1' in main.foobar - we will check that in the next breakpoint.
locals := tester.variables(localsScope)
locals = tester.variables(localsScope)
checkVarExact(t, locals, -1, "a1", "a1", `"bur"`, "string", noChildren)
tester.expectSetVariable(localsScope, "a1", `"fur"`)
tester.evaluate("a1", `"fur"`, noChildren)
Expand Down