Skip to content

fix(test): merge-two-features tests build their own merge - #1278

Merged
sebyx07 merged 1 commit into
mainfrom
fix/merge-test-order
Nov 19, 2026
Merged

sebyx07 merged 1 commit into
mainfrom
fix/merge-test-order

Conversation

@sebyx07

@sebyx07 sebyx07 commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

Closes #1277.

the other direction writes the same bytes compared against bytes that the previous test stored in a shared variable. When flake-hunt ran the tests with --randomize and this test ran first, it saw an empty array.

Each test now builds its own merge through one helper, merged(branch, ours, theirs). The file passes alone under seeds 3080077757, 2150480779, 1 and 2. That doesn't prove the fix, because the issue notes the cross-file order is lost. The fix is that no test reads another test's state.

🤖 Generated with Claude Code

Closes #1277. 'the other direction writes the same bytes' read bytes the
previous test stored, so a randomized order left them empty.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@sebyx07
sebyx07 merged commit 1b5ba68 into main Nov 19, 2026
43 checks passed
@sebyx07
sebyx07 deleted the fix/merge-test-order branch November 19, 2026 10:53
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.

flake: packages/cli/src/merge-two-features.test.ts > unit · two generated features, one merge > the other direction writes the same bytes

1 participant