Skip to content

fix: restore live event submit path for apply patch tests#20108

Merged
bolinfest merged 1 commit intomainfrom
pr20108
Apr 29, 2026
Merged

fix: restore live event submit path for apply patch tests#20108
bolinfest merged 1 commit intomainfrom
pr20108

Conversation

@bolinfest
Copy link
Copy Markdown
Collaborator

@bolinfest bolinfest commented Apr 29, 2026

Summary

This fixes the CI regression introduced by #20040.

That PR migrated several apply_patch_cli tests from direct codex.submit(Op::UserTurn { ... }) calls to harness.submit(...). harness.submit() waits for TurnComplete before returning, which drains the same event stream that these tests use to assert TurnDiff, PatchApplyUpdated, and related live events. The regressed tests then timed out waiting for events that had already been consumed.

This change restores a no-wait submit path for the event-observing apply_patch_cli tests so they can watch the turn stream directly again.

What Changed

  • added a local submit_without_wait(...) helper in codex-rs/core/tests/suite/apply_patch_cli.rs
  • switched the apply_patch_cli tests that assert live turn events back to that helper
  • left the profile-backed harness.submit(...) migration in place for tests that only care about final filesystem or tool output state

Why macOS Looked Green

In the failing run 25084487331, //codex-rs/core:core-all-test was cached on macOS, so the regressed tests were not rerun there. The Linux GNU, Linux MUSL, and Windows Bazel jobs reran the target and exposed the failure.

Verification

  • cargo test -p codex-core apply_patch_ -- --nocapture
  • previously failing local cases now pass again:
    • apply_patch_cli_move_without_content_change_has_no_turn_diff
    • apply_patch_turn_diff_for_rename_with_content_change
    • apply_patch_aggregates_diff_across_multiple_tool_calls

@bolinfest bolinfest changed the title fix: restore raw submit path for apply patch event tests fix: restore live event submit path for apply patch tests Apr 29, 2026
@bolinfest bolinfest marked this pull request as ready for review April 29, 2026 01:06
@bolinfest bolinfest requested a review from a team as a code owner April 29, 2026 01:06
@bolinfest bolinfest merged commit c9f7c88 into main Apr 29, 2026
24 checks passed
@bolinfest bolinfest deleted the pr20108 branch April 29, 2026 01:09
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 29, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants