Unverified Commit 61bd07fa authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

[test] add custom timeout for start server (#80160)

parent 8bd41593
...@@ -4,6 +4,9 @@ describe('clientTraceMetadata', () => { ...@@ -4,6 +4,9 @@ describe('clientTraceMetadata', () => {
const { next, isNextDev } = nextTestSetup({ const { next, isNextDev } = nextTestSetup({
files: __dirname, files: __dirname,
dependencies: require('./package.json').dependencies, dependencies: require('./package.json').dependencies,
// This test sometimes takes longer than the default timeout, extending it bit longer
// to avoid flakiness.
startServerTimeout: 15_000,
}) })
describe('app router', () => { describe('app router', () => {
......
...@@ -44,6 +44,7 @@ export interface NextInstanceOpts { ...@@ -44,6 +44,7 @@ export interface NextInstanceOpts {
forcedPort?: string forcedPort?: string
serverReadyPattern?: RegExp serverReadyPattern?: RegExp
patchFileDelay?: number patchFileDelay?: number
startServerTimeout?: number
} }
/** /**
...@@ -84,6 +85,7 @@ export class NextInstance { ...@@ -84,6 +85,7 @@ export class NextInstance {
public env: Record<string, string> public env: Record<string, string>
public forcedPort?: string public forcedPort?: string
public dirSuffix: string = '' public dirSuffix: string = ''
public startServerTimeout: number = 10_000 // 10 seconds
public serverReadyPattern: RegExp = / ✓ Ready in / public serverReadyPattern: RegExp = / ✓ Ready in /
patchFileDelay: number = 0 patchFileDelay: number = 0
...@@ -386,7 +388,7 @@ export class NextInstance { ...@@ -386,7 +388,7 @@ export class NextInstance {
protected setServerReadyTimeout( protected setServerReadyTimeout(
reject: (reason?: unknown) => void, reject: (reason?: unknown) => void,
ms = 10_000 ms: number
): NodeJS.Timeout { ): NodeJS.Timeout {
return setTimeout(() => { return setTimeout(() => {
reject( reject(
......
...@@ -93,7 +93,10 @@ export class NextDevInstance extends NextInstance { ...@@ -93,7 +93,10 @@ export class NextDevInstance extends NextInstance {
} }
}) })
const serverReadyTimeoutId = this.setServerReadyTimeout(reject) const serverReadyTimeoutId = this.setServerReadyTimeout(
reject,
this.startServerTimeout
)
const readyCb = (msg) => { const readyCb = (msg) => {
const resolveServer = () => { const resolveServer = () => {
......
...@@ -149,7 +149,10 @@ export class NextStartInstance extends NextInstance { ...@@ -149,7 +149,10 @@ export class NextStartInstance extends NextInstance {
} }
}) })
const serverReadyTimeoutId = this.setServerReadyTimeout(reject) const serverReadyTimeoutId = this.setServerReadyTimeout(
reject,
this.startServerTimeout
)
const readyCb = (msg) => { const readyCb = (msg) => {
const colorStrippedMsg = stripAnsi(msg) const colorStrippedMsg = stripAnsi(msg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment