Skip to content

Commit 6b9bb4d

Browse files
mchwangclaude
andcommitted
Start the merge-repair recovery test from a task in review
main (#62, #53) lets only a task in review begin a merge attempt, so the test puts its queued task in review before it records the merge. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 23fbe61 commit 6b9bb4d

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

‎test/runner-recovery.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ describe('finalizing interrupted attempts', () => {
164164
});
165165
it('repairs a confirmed merge whose task status or event is missing', () => {
166166
const { store, raw } = fixture();
167+
// Only a task in review can start a merge.
168+
raw(`UPDATE tasks SET status='in review'`);
167169
const state = { revision: 1, snapshotId: store.getSnapshot(id(1)).id, reviewVersion: store.reviewVersion(id(1)) };
168170
const merge = store.beginMergeAttempt(id(1), state, oid(2), null, 'direct');
169171
store.finishMergeAttempt(id(1), merge.id, { state: 'merged' });

0 commit comments

Comments
 (0)