Skip to content

Commit a417833

Browse files
test(adk): tolerate cancel completion race
Change-Id: I128434ec8500151f480082149f63f37fb838ee15
1 parent b3df2cd commit a417833

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

adk/cancel_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,10 +348,12 @@ func TestWithCancel_AgenticResumeStreamableToolTimeout_DoesNotPersistTypedNil(t
348348
}()
349349
select {
350350
case err = <-cancelDone:
351-
assert.True(t, err == nil || errors.Is(err, ErrCancelTimeout), "unexpected cancel wait error: %v", err)
351+
assert.True(t, err == nil || errors.Is(err, ErrCancelTimeout) || errors.Is(err, ErrExecutionEnded),
352+
"unexpected cancel wait error: %v", err)
352353
case <-time.After(5 * time.Second):
353354
t.Fatal("resume cancel handle did not complete")
354355
}
356+
executionCompletedBeforeCancel := errors.Is(err, ErrExecutionEnded)
355357

356358
var hasCancelError bool
357359
for {
@@ -371,7 +373,8 @@ func TestWithCancel_AgenticResumeStreamableToolTimeout_DoesNotPersistTypedNil(t
371373
assert.NotContains(t, errText, "cannot encode nil pointer")
372374
assert.NotContains(t, errText, "*adk.agenticReactInput(nil=true")
373375
}
374-
assert.True(t, hasCancelError, "expected CancelError in resume event stream")
376+
assert.True(t, hasCancelError || executionCompletedBeforeCancel,
377+
"expected CancelError in resume event stream unless execution completed before cancel")
375378
}
376379

377380
func TestCancelContext(t *testing.T) {

0 commit comments

Comments
 (0)