Skip to content

test: fix ~3% flake in resetGitWorktreeSandbox worktree-listing assertion #6099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atomantic merged 1 commit into from
Sep 3, 2026
Merged

test: fix ~3% flake in resetGitWorktreeSandbox worktree-listing assertion #6099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions server/lib/gitTestRepo.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,15 @@ describe('resetGitWorktreeSandbox', () => {

await resetGitWorktreeSandbox(dest, initialHead);

// Parse porcelain into worktree entries and assert only `dest` itself
// remains, rather than substring-matching 'wt-a'/'wt-b' against the raw
// listing — that substring can coincidentally appear inside dest's own
// random mkdtemp() suffix (~3.2% chance per prefix) and false-fail (#6059).
// Counting entries also sidesteps comparing absolute paths directly,
// which git can respell on Windows (see the assertPath test above, #6003).
const listing = (await execGit(['worktree', 'list', '--porcelain'], dest)).stdout;
expect(listing).not.toContain('wt-a');
expect(listing).not.toContain('wt-b');
const worktreeEntries = listing.split(/\r?\n/).filter((line) => line.startsWith('worktree '));
expect(worktreeEntries).toHaveLength(1);
expect((await execGit(['branch', '--format=%(refname:short)'], dest)).stdout.trim()).toBe('main');
expect((await execGit(['rev-parse', 'HEAD'], dest)).stdout.trim()).toBe(initialHead);
});
Expand Down