Skip to content

Carry main fixes into redesign main (#746) - #700

Merged
thomasluizon merged 1 commit into
redesign/mainfrom
chore/ticket-746-carry-events-hang-guard
Oct 4, 2026
Merged

thomasluizon merged 1 commit into
redesign/mainfrom
chore/ticket-746-carry-events-hang-guard

Conversation

@thomasluizon

Copy link
Copy Markdown
Owner

Carries 448a582825bd83346dbf38806bf7f0b05ca22382 from main (orbit-api#699, thomasluizon/orbit-tickets#1208) with git cherry-pick -x, committed as 0f043a16.

The carry applied without conflicts. Its only changed path is tests/Orbit.Infrastructure.Tests/Events/EventsControllerTests.cs: a shared 30-second hang guard replaces the separate 2-second and 4-second guards for stream waits and response polling. This preserves the upstream test change exactly.

Test evidence

All commands ran from the repository root; exit codes were read from process completion. Logs are outside the worktree.

Command Exit code
env -u LANG dotnet build Orbit.slnx 0
env -u LANG dotnet test 0
env LC_ALL=en_US.UTF-8 dotnet build Orbit.slnx 0
env LC_ALL=en_US.UTF-8 dotnet test 0

Both builds reported zero errors. Both full test runs passed 9,346 tests. This is an unchanged carry of the upstream test commit; no regression test was authored or strengthened in this pull request.

Refs thomasluizon/orbit-tickets#746
Refs thomasluizon/orbit-tickets#1208

@pullfrog pullfrog Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ No new issues found.

Reviewed changes: Reviewed the test-only hang-guard carry in EventsControllerTests.cs and traced the surrounding event-stream cancellation behavior.

  • Shared hang guard: Replaces the separate 2-second and 4-second stream-completion and response-polling timeouts with a single 30-second timeout, preserving the existing replay, publication, payload, and lifetime assertions.
  • Verification: All 12 focused EventsControllerTests passed with restore and build; the worktree remained clean. The full solution suite was not independently rerun.

Pullfrog  | View workflow run | Using gpt-6.1-sol | 𝕏

@sonarqubecloud

sonarqubecloud Bot commented Oct 4, 2026

Copy link
Copy Markdown

@thomasluizon
thomasluizon merged commit 8841c8a into redesign/main Oct 4, 2026
26 checks passed
@thomasluizon
thomasluizon deleted the chore/ticket-746-carry-events-hang-guard branch October 4, 2026 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant