Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/parity/test/floor-merge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ describe('the floor merge driver is registered', () => {

it('marks exactly the floor and pin files the landing driver judges (isFloorFile) merge=dragon-floor', () => {
const tracked = execFileSync('git', ['ls-files', '-z'], { cwd: repoPath('.'), encoding: 'utf8', maxBuffer: 64 * 1024 * 1024 }).split('\0').filter((p) => p !== '');
const marked = execFileSync('git', ['ls-files', '-z', ':(attr:merge=dragon-floor)'], { cwd: repoPath('.'), encoding: 'utf8' }).split('\0').filter((p) => p !== '');
const marked = execFileSync('git', ['ls-files', '-z', ':(attr:merge=dragon-floor)'], { cwd: repoPath('.'), encoding: 'utf8', maxBuffer: 64 * 1024 * 1024 }).split('\0').filter((p) => p !== '');
expect(marked).toEqual(tracked.filter(isFloorFile));
expect(marked.length).toBeGreaterThanOrEqual(6);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/parity/test/land.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ describe('floors may only rise (the landing commit against master)', () => {
});

it('reads every floor file in this tree, and finds none below itself', () => {
const files = execFileSync('git', ['ls-files', 'packages'], { cwd: repoPath('.'), encoding: 'utf8' }).split('\n').filter(isFloorFile);
const files = execFileSync('git', ['ls-files', '-z', 'packages'], { cwd: repoPath('.'), encoding: 'utf8', maxBuffer: 64 * 1024 * 1024 }).split('\0').filter(isFloorFile);
expect(files.length).toBeGreaterThanOrEqual(6);
for (const f of files) {
const t = readFileSync(repoPath(f), 'utf8');
Expand Down
2 changes: 1 addition & 1 deletion packages/parity/test/sorted-merge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ describe('the sorted merge driver is registered on exactly the sorted registries
});

it('marks exactly SORTED_REGISTRIES merge=dragon-sorted', () => {
const marked = execFileSync('git', ['ls-files', '-z', ':(attr:merge=dragon-sorted)'], { cwd: repoPath('.'), encoding: 'utf8' }).split('\0').filter((p) => p !== '');
const marked = execFileSync('git', ['ls-files', '-z', ':(attr:merge=dragon-sorted)'], { cwd: repoPath('.'), encoding: 'utf8', maxBuffer: 64 * 1024 * 1024 }).split('\0').filter((p) => p !== '');
expect(marked).toEqual(Object.keys(SORTED_REGISTRIES).sort());
});

Expand Down
Loading