From 32c9b9ef930fc571e5829b4fb107c07a9563b04a Mon Sep 17 00:00:00 2001 From: garrytan Date: Sat, 17 Oct 2026 17:49:28 +0000 Subject: [PATCH] test(brain-sync): give the retry-merge fixture a git identity The retry merge commits with the ambient identity. CI and Ubicloud runners have none under the test HOME, so the merge failed before the outgoing case check ran and the drain reported push_failed instead of error. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- test/brain-sync.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/brain-sync.test.ts b/test/brain-sync.test.ts index 85a812262..7bffd7c45 100644 --- a/test/brain-sync.test.ts +++ b/test/brain-sync.test.ts @@ -809,6 +809,9 @@ describe('gstack-brain-sync per-file hold', () => { expect(git(['-c', 'user.name=fixture', '-c', 'user.email=fixture@example.com', 'commit', '-qm', 'remote plan'], peer).status).toBe(0); expect(git(['push', '-q', 'origin', 'HEAD'], peer).status).toBe(0); expect(git(['config', 'core.ignorecase', 'false']).status).toBe(0); + // The retry merge commits with the ambient identity; a CI runner has none. + expect(git(['config', 'user.name', 'fixture']).status).toBe(0); + expect(git(['config', 'user.email', 'fixture@example.com']).status).toBe(0); write(CLEAN, '# local plan\n'); expect(drain().status).toBe(0); expect(statusJson().status).toBe('error');