Carry main fixes into redesign main (#746) - #700
Merged
thomasluizon merged 1 commit intoOct 4, 2026
Merged
Conversation
(cherry picked from commit 448a582)
There was a problem hiding this comment.
✅ 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
EventsControllerTestspassed with restore and build; the worktree remained clean. The full solution suite was not independently rerun.
gpt-6.1-sol | 𝕏
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.




Carries
448a582825bd83346dbf38806bf7f0b05ca22382from main (orbit-api#699, thomasluizon/orbit-tickets#1208) withgit cherry-pick -x, committed as0f043a16.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.
env -u LANG dotnet build Orbit.slnxenv -u LANG dotnet testenv LC_ALL=en_US.UTF-8 dotnet build Orbit.slnxenv LC_ALL=en_US.UTF-8 dotnet testBoth 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