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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "Allow slow Git process startup in the sequential repository-state integration test.",
"type": "none",
"packageName": "@rushstack/package-deps-hash"
}
],
"packageName": "@rushstack/package-deps-hash",
"email": "3408176+TheLarkInn@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "Allow slow daemon startup in queued-request resend integration tests.",
"type": "none",
"packageName": "@rushstack/rush-client-core"
}
],
"packageName": "@rushstack/rush-client-core",
"email": "3408176+TheLarkInn@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
Expand Up @@ -1352,6 +1352,7 @@ describe(RepoStateCache.name, () => {
expect(carryOverSpy.mock.results).toEqual([{ type: 'return', value: undefined }]);
});

// Allow for the many real Git processes launched sequentially, especially on Windows.
it('returns the same state as getDetailedRepoStateAsync after each command', async () => {
const carryOverSpy: jest.SpyInstance = jest.spyOn(GitIndexFile, 'tryCarryOverGitIndexCaches');
const commands: (() => void)[] = [
Expand Down Expand Up @@ -1381,7 +1382,7 @@ describe(RepoStateCache.name, () => {
carryOverSpy.mock.results.filter(({ value }: jest.MockResult<Buffer | undefined>) => value)
).not.toHaveLength(0);
}
});
}, 30000);

itUnlessWindows(
'computes the state without the cache when the attributes changed since the previous copy',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ import { connectOrStartDaemonAsync, type IConnectOrStartDaemonOptions } from '..
import { executeWithDaemonRestartAsync, type IDaemonRestartNotice } from '../executeWithDaemonRestart';
import { removeTestFolderAsync, waitForTestProcessExitAsync } from './TestProcessExit';

// Starting and replacing real daemon processes can exceed Jest's default 5 seconds on a busy CI agent.
jest.setTimeout(30_000);

function readIfPresent(filePath: string): string {
return fs.existsSync(filePath) ? fs.readFileSync(filePath, 'utf8') : '';
}
Expand Down
Loading