Skip to content

Commit 0806daa

Browse files
committed
Merge branch 'make-dev-agentic' into codex/app-dev-json
# Conflicts: # packages/app/src/cli/services/dev/ui.integration.test.ts
2 parents d54e974 + 83d5e5c commit 0806daa

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

‎packages/app/src/cli/services/dev/ui.integration.test.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ const statusUrl = new URL('./processes/dev-session/dev-session-status-manager.ts
1111
const postrunUrl = new URL('../../../../../cli-kit/src/public/node/hooks/postrun.ts', import.meta.url).href
1212
const sourceLoaderUrl = new URL('../../../../test/fixtures/app-source-loader.js', import.meta.url).href
1313
const tsconfigPath = fileURLToPath(new URL('../../../../test/fixtures/tsconfig.json', import.meta.url))
14+
// Windows starts PowerShell to enumerate and stop the remaining child processes.
15+
const postrunExitTimeoutMs = process.platform === 'win32' ? 15000 : 5000
1416

1517
// Windows process.kill() terminates immediately instead of delivering a catchable signal.
1618
// Exercise handlers on every platform and OS signal delivery where it is supported.
@@ -85,7 +87,10 @@ test.each(shutdownCases.flatMap((entry) => ['text', 'json'].map((mode) => ({...e
8587
process.stderr.write('Session cleaned up\\n')
8688
await hook.call({}, {config: {}, Command: {id: 'app:dev'}})
8789
process.stderr.write('Postrun completed\\n')
88-
setTimeout(() => process.exit(2), 5000)
90+
setTimeout(() => {
91+
process.stderr.write('Postrun shutdown timed out\\n')
92+
process.exit(2)
93+
}, ${postrunExitTimeoutMs})
8994
`
9095
const result = await captureOutputWithExitCode(
9196
process.execPath,

0 commit comments

Comments
 (0)