Skip to content

Commit fc6f282

Browse files
CopilotCopilot
committed
Fix Go E2E staticcheck nil guards
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 3e2880f commit fc6f282

12 files changed

Lines changed: 24 additions & 0 deletions

‎go/internal/e2e/builtin_tools_e2e_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ func assistantContent(t *testing.T, event *copilot.SessionEvent) string {
241241

242242
if event == nil {
243243
t.Fatal("Expected assistant message, got nil")
244+
return ""
244245
}
245246
data, ok := event.Data.(*copilot.AssistantMessageData)
246247
if !ok {

‎go/internal/e2e/client_options_e2e_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ func TestClientOptionsE2E(t *testing.T) {
217217
}
218218
if createReq == nil {
219219
t.Fatalf("session.create request was not captured. Captured requests: %+v", updated.Requests)
220+
return
220221
}
221222
params, ok := createReq.Params.(map[string]any)
222223
if !ok {

‎go/internal/e2e/event_fidelity_e2e_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func TestEventFidelityE2E(t *testing.T) {
5454

5555
if usageEvent == nil {
5656
t.Fatalf("Expected at least one assistant.usage event; events=%v", eventFidelityTypes(snapshot))
57+
return
5758
}
5859
if usageEvent.Model == "" {
5960
t.Errorf("Expected assistant.usage event to have a non-empty model field, got %#v", usageEvent)
@@ -110,6 +111,7 @@ func TestEventFidelityE2E(t *testing.T) {
110111

111112
if usageInfo == nil {
112113
t.Fatalf("Expected at least one session.usage_info event; events=%v", eventFidelityTypes(snapshot))
114+
return
113115
}
114116
if usageInfo.CurrentTokens <= 0 {
115117
t.Errorf("Expected session.usage_info.currentTokens > 0, got %v", usageInfo.CurrentTokens)
@@ -460,6 +462,7 @@ func TestEventFidelityE2E(t *testing.T) {
460462
assistantEvent := firstAssistantMessageEventFidelityData(snapshot)
461463
if assistantEvent == nil {
462464
t.Fatalf("Expected at least one assistant.message event; events=%v", eventFidelityTypes(snapshot))
465+
return
463466
}
464467
if assistantEvent.MessageID == "" {
465468
t.Fatalf("Expected assistant.message messageId, got %#v", assistantEvent)

‎go/internal/e2e/multi_client_e2e_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ func TestMultiClientE2E(t *testing.T) {
377377
}
378378
if response1 == nil {
379379
t.Fatalf("Expected response with content")
380+
return
380381
}
381382
rd1, ok := response1.Data.(*copilot.AssistantMessageData)
382383
if !ok {
@@ -394,6 +395,7 @@ func TestMultiClientE2E(t *testing.T) {
394395
}
395396
if response2 == nil {
396397
t.Fatalf("Expected response with content")
398+
return
397399
}
398400
rd2, ok := response2.Data.(*copilot.AssistantMessageData)
399401
if !ok {
@@ -450,6 +452,7 @@ func TestMultiClientE2E(t *testing.T) {
450452
}
451453
if stableResponse == nil {
452454
t.Fatalf("Expected response with content")
455+
return
453456
}
454457
srd, ok := stableResponse.Data.(*copilot.AssistantMessageData)
455458
if !ok {
@@ -467,6 +470,7 @@ func TestMultiClientE2E(t *testing.T) {
467470
}
468471
if ephemeralResponse == nil {
469472
t.Fatalf("Expected response with content")
473+
return
470474
}
471475
erd, ok := ephemeralResponse.Data.(*copilot.AssistantMessageData)
472476
if !ok {
@@ -497,6 +501,7 @@ func TestMultiClientE2E(t *testing.T) {
497501
}
498502
if afterResponse == nil {
499503
t.Fatalf("Expected response with content")
504+
return
500505
}
501506
ard, ok := afterResponse.Data.(*copilot.AssistantMessageData)
502507
if !ok {

‎go/internal/e2e/pending_work_resume_e2e_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ func TestPendingWorkResumeE2E(t *testing.T) {
539539
}
540540
if resumeEvent == nil {
541541
t.Fatal("Expected a session.resume event")
542+
return
542543
}
543544
if resumeEvent.ContinuePendingWork == nil || *resumeEvent.ContinuePendingWork != false {
544545
t.Errorf("Expected ContinuePendingWork=false in resume event, got %v", resumeEvent.ContinuePendingWork)
@@ -634,6 +635,7 @@ func TestPendingWorkResumeE2E(t *testing.T) {
634635
}
635636
if resumeEvent == nil {
636637
t.Fatal("Expected a session.resume event")
638+
return
637639
}
638640
if resumeEvent.ContinuePendingWork == nil || *resumeEvent.ContinuePendingWork != true {
639641
t.Errorf("Expected ContinuePendingWork=true in resume event, got %v", resumeEvent.ContinuePendingWork)

‎go/internal/e2e/rpc_event_side_effects_e2e_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ func TestRpcEventSideEffectsE2E(t *testing.T) {
175175
userEvent := firstUserMessageEvent(messages)
176176
if userEvent == nil {
177177
t.Fatal("Expected at least one user.message in persisted history")
178+
return
178179
}
179180
targetEventID := userEvent.ID
180181

@@ -230,6 +231,7 @@ func TestRpcEventSideEffectsE2E(t *testing.T) {
230231
userEvent := firstUserMessageEvent(messages)
231232
if userEvent == nil {
232233
t.Fatal("Expected at least one user.message in persisted history")
234+
return
233235
}
234236

235237
truncateResult, err := session.RPC.History.Truncate(t.Context(), &rpc.HistoryTruncateRequest{EventID: userEvent.ID})

‎go/internal/e2e/rpc_server_e2e_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ func TestRpcServerE2E(t *testing.T) {
180180
discovered := findServerSkill(skills.Skills, skillName)
181181
if discovered == nil {
182182
t.Fatalf("Expected to discover skill %q", skillName)
183+
return
183184
}
184185
if discovered.Description != "Skill discovered by server-scoped RPC tests." {
185186
t.Errorf("Expected description to match, got %q", discovered.Description)
@@ -211,6 +212,7 @@ func TestRpcServerE2E(t *testing.T) {
211212
disabledSkill := findServerSkill(disabled.Skills, skillName)
212213
if disabledSkill == nil {
213214
t.Fatalf("Expected to find skill %q after disable", skillName)
215+
return
214216
}
215217
if disabledSkill.Enabled {
216218
t.Errorf("Expected skill %q to be Enabled=false after global disable", skillName)

‎go/internal/e2e/rpc_session_state_e2e_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ func TestRpcSessionStateE2E(t *testing.T) {
319319
}
320320
if fork == nil {
321321
t.Fatal("Expected non-nil fork result")
322+
return
322323
}
323324
if strings.TrimSpace(fork.SessionID) == "" {
324325
t.Fatal("Expected non-empty fork session id")
@@ -379,6 +380,7 @@ func TestRpcSessionStateE2E(t *testing.T) {
379380
}
380381
if secondUserEvent == nil {
381382
t.Fatal("Expected the second user.message in persisted history")
383+
return
382384
}
383385
boundaryEventID := secondUserEvent.ID
384386

‎go/internal/e2e/session_e2e_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,7 @@ func TestSessionE2E(t *testing.T) {
989989

990990
if metadata == nil {
991991
t.Fatal("Expected metadata to be non-nil")
992+
return
992993
}
993994

994995
if metadata.SessionID != session.SessionID {
@@ -1043,6 +1044,7 @@ func TestSessionE2E(t *testing.T) {
10431044

10441045
if lastSessionID == nil {
10451046
t.Fatal("Expected last session ID to be non-nil")
1047+
return
10461048
}
10471049

10481050
if *lastSessionID != session.SessionID {
@@ -1561,6 +1563,7 @@ func TestSessionMessageOptionsE2E(t *testing.T) {
15611563
}
15621564
if userMsg == nil {
15631565
t.Fatal("No user.message event found")
1566+
return
15641567
}
15651568
if userMsg.Content != "Say mode ok." {
15661569
t.Errorf("Expected Content 'Say mode ok.', got %q", userMsg.Content)

‎go/internal/e2e/skills_e2e_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ func TestSkillsE2E(t *testing.T) {
298298
}
299299
if discovered == nil {
300300
t.Fatalf("Expected to discover skill %q via EnableConfigDiscovery", skillName)
301+
return
301302
}
302303
if !discovered.Enabled {
303304
t.Error("Expected discovered skill to be Enabled=true")

0 commit comments

Comments
 (0)