Improve handling of failed nextBuild()
calls in test suite (#63717)
## What? Currently `next build` with Turbopack fails to run in certain tests (as expected), the problem with that is that the `afterAll()` calls assume the server was started, which doesn't happen when the build fails, and then causes a timeout that can't be reported if an error happens. This change ensures the error around `server['__app']` doesn't happen. <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> Closes NEXT-2933
This commit is contained in:
parent
916174b7ff
commit
0c0573fd65
2 changed files with 8 additions and 4 deletions
|
@ -529,6 +529,9 @@ export async function killApp(
|
|||
instance?: ChildProcess,
|
||||
signal: NodeJS.Signals | number = 'SIGKILL'
|
||||
) {
|
||||
if (!instance) {
|
||||
return
|
||||
}
|
||||
if (
|
||||
instance?.pid &&
|
||||
instance.exitCode === null &&
|
||||
|
@ -558,7 +561,10 @@ export async function startApp(app: NextServer) {
|
|||
return server
|
||||
}
|
||||
|
||||
export async function stopApp(server: http.Server) {
|
||||
export async function stopApp(server: http.Server | undefined) {
|
||||
if (!server) {
|
||||
return
|
||||
}
|
||||
if (server['__app']) {
|
||||
await server['__app'].close()
|
||||
}
|
||||
|
|
|
@ -22,9 +22,7 @@ describe('bfcache-routing', () => {
|
|||
})
|
||||
|
||||
afterAll(() => {
|
||||
if (app) {
|
||||
stopApp(app)
|
||||
}
|
||||
stopApp(app)
|
||||
})
|
||||
|
||||
it('should not suspend indefinitely when page is restored from bfcache after an mpa navigation', async () => {
|
||||
|
|
Loading…
Reference in a new issue