Unverified Commit 50857dad authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix isolated tests on windows and update azure config (#44457)

Fixes handling in isolated tests for windows and adds initial setup to run the main `app-dir` test suite. Also adds retrying when fetching test timings fails due to rate limiting. 

Closes: https://github.com/vercel/next.js/pull/44331
parent 448c9c82
...@@ -109,7 +109,7 @@ stages: ...@@ -109,7 +109,7 @@ stages:
condition: eq(variables['isDocsOnly'], 'No') condition: eq(variables['isDocsOnly'], 'No')
displayName: 'Run tests' displayName: 'Run tests'
- job: test_integration_app_dir - job: test_e2e_dev
pool: pool:
vmImage: 'windows-2019' vmImage: 'windows-2019'
steps: steps:
...@@ -139,6 +139,44 @@ stages: ...@@ -139,6 +139,44 @@ stages:
condition: eq(variables['isDocsOnly'], 'No') condition: eq(variables['isDocsOnly'], 'No')
- script: | - script: |
node run-tests.js -c 1 test/integration/app-dir-basic/test/index.test.js node run-tests.js -c 1 --debug test/e2e/app-dir/app/index.test.ts
condition: eq(variables['isDocsOnly'], 'No') condition: eq(variables['isDocsOnly'], 'No')
displayName: 'Run tests' displayName: 'Run tests (E2E Development)'
env:
NEXT_TEST_MODE: 'dev'
- job: test_e2e_prod
pool:
vmImage: 'windows-2019'
steps:
- task: NodeTool@0
inputs:
versionSpec: $(node_16_version)
displayName: 'Install Node.js'
- bash: |
node scripts/run-for-change.js --not --type docs --exec echo "##vso[task.setvariable variable=isDocsOnly]No"
displayName: 'Check Docs Only Change'
- script: npm i -g pnpm@$(PNPM_VERSION)
condition: eq(variables['isDocsOnly'], 'No')
- script: pnpm config set store-dir $(PNPM_CACHE_FOLDER)
condition: eq(variables['isDocsOnly'], 'No')
- script: pnpm store path
condition: eq(variables['isDocsOnly'], 'No')
- script: pnpm install && pnpm run build
condition: eq(variables['isDocsOnly'], 'No')
displayName: 'Install and build'
- script: npx playwright install chromium
condition: eq(variables['isDocsOnly'], 'No')
- script: |
node run-tests.js -c 1 --debug test/e2e/app-dir/app/index.test.ts
condition: eq(variables['isDocsOnly'], 'No')
displayName: 'Run tests (E2E Production)'
env:
NEXT_TEST_MODE: 'start'
...@@ -49,11 +49,22 @@ const cleanUpAndExit = async (code) => { ...@@ -49,11 +49,22 @@ const cleanUpAndExit = async (code) => {
} }
async function getTestTimings() { async function getTestTimings() {
const timingsRes = await fetch(TIMINGS_API, { let timingsRes
headers: {
...TIMINGS_API_HEADERS, const doFetch = () =>
}, fetch(TIMINGS_API, {
}) headers: {
...TIMINGS_API_HEADERS,
},
})
timingsRes = await doFetch()
if (timingsRes.status === 403) {
const delay = 15
console.log(`Got 403 response waiting ${delay} seconds before retry`)
await new Promise((resolve) => setTimeout(resolve, delay * 1000))
timingsRes = await doFetch()
}
if (!timingsRes.ok) { if (!timingsRes.ok) {
throw new Error(`request status: ${timingsRes.status}`) throw new Error(`request status: ${timingsRes.status}`)
...@@ -219,6 +230,7 @@ async function main() { ...@@ -219,6 +230,7 @@ async function main() {
}) })
if ( if (
process.platform !== 'win32' &&
process.env.NEXT_TEST_MODE !== 'deploy' && process.env.NEXT_TEST_MODE !== 'deploy' &&
((testType && testType !== 'unit') || hasIsolatedTests) ((testType && testType !== 'unit') || hasIsolatedTests)
) { ) {
......
export default function page() {
return <div id="blog">this is blog</div>
}
export default function RootLayout({ children }) {
return (
<html>
<head></head>
<body>{children}</body>
</html>
)
}
export default function page() {
return <div id="home">this is home</div>
}
module.exports = {
experimental: {
appDir: true,
},
}
/* eslint-env jest */
import { join } from 'path'
import cheerio from 'cheerio'
import { runDevSuite, runProdSuite, renderViaHTTP } from 'next-test-utils'
import webdriver from 'next-webdriver'
const appDir = join(__dirname, '..')
function runTests(context, env) {
describe('App Dir Basic', () => {
it('should render html properly', async () => {
const $index = cheerio.load(await renderViaHTTP(context.appPort, '/'))
const $blog = cheerio.load(await renderViaHTTP(context.appPort, '/blog'))
expect($index('#home').text()).toBe('this is home')
expect($blog('#blog').text()).toBe('this is blog')
})
it('should hydrate pages properly', async () => {
const browser = await webdriver(context.appPort, '/')
const indexHtml = await browser.waitForElementByCss('#home').text()
const url = await browser.url()
await browser.loadPage(url + 'blog')
const blogHtml = await browser.waitForElementByCss('#blog').text()
expect(indexHtml).toBe('this is home')
expect(blogHtml).toBe('this is blog')
})
})
}
runDevSuite('App Dir Basic', appDir, { runTests })
runProdSuite('App Dir Basic', appDir, { runTests })
import { spawn } from 'child_process' import { spawn } from 'cross-spawn'
import { Span } from 'next/trace' import { Span } from 'next/trace'
import { NextInstance } from './base' import { NextInstance } from './base'
...@@ -36,65 +36,70 @@ export class NextDevInstance extends NextInstance { ...@@ -36,65 +36,70 @@ export class NextDevInstance extends NextInstance {
} }
await new Promise<void>((resolve, reject) => { await new Promise<void>((resolve, reject) => {
this.childProcess = spawn(startArgs[0], startArgs.slice(1), { try {
cwd: useDirArg ? process.cwd() : this.testDir, this.childProcess = spawn(startArgs[0], startArgs.slice(1), {
stdio: ['ignore', 'pipe', 'pipe'], cwd: useDirArg ? process.cwd() : this.testDir,
shell: false, stdio: ['ignore', 'pipe', 'pipe'],
env: { shell: false,
...process.env, env: {
...this.env, ...process.env,
NODE_ENV: '' as any, ...this.env,
PORT: this.forcedPort || '0', NODE_ENV: '' as any,
__NEXT_TEST_MODE: '1', PORT: this.forcedPort || '0',
__NEXT_TEST_WITH_DEVTOOL: '1', __NEXT_TEST_MODE: '1',
}, __NEXT_TEST_WITH_DEVTOOL: '1',
}) },
})
this._cliOutput = '' this._cliOutput = ''
this.childProcess.stdout.on('data', (chunk) => { this.childProcess.stdout.on('data', (chunk) => {
const msg = chunk.toString() const msg = chunk.toString()
process.stdout.write(chunk) process.stdout.write(chunk)
this._cliOutput += msg this._cliOutput += msg
this.emit('stdout', [msg]) this.emit('stdout', [msg])
}) })
this.childProcess.stderr.on('data', (chunk) => { this.childProcess.stderr.on('data', (chunk) => {
const msg = chunk.toString() const msg = chunk.toString()
process.stderr.write(chunk) process.stderr.write(chunk)
this._cliOutput += msg this._cliOutput += msg
this.emit('stderr', [msg]) this.emit('stderr', [msg])
}) })
this.childProcess.on('close', (code, signal) => { this.childProcess.on('close', (code, signal) => {
if (this.isStopping) return if (this.isStopping) return
if (code || signal) { if (code || signal) {
throw new Error( throw new Error(
`next dev exited unexpectedly with code/signal ${code || signal}` `next dev exited unexpectedly with code/signal ${code || signal}`
) )
} }
}) })
const readyCb = (msg) => { const readyCb = (msg) => {
if (msg.includes('started server on') && msg.includes('url:')) { if (msg.includes('started server on') && msg.includes('url:')) {
// turbo devserver emits stdout in rust directly, can contain unexpected chars with color codes // turbo devserver emits stdout in rust directly, can contain unexpected chars with color codes
// strip out again for the safety // strip out again for the safety
this._url = msg this._url = msg
.split('url: ') .split('url: ')
.pop() .pop()
.trim() .trim()
.split(require('os').EOL)[0] .split(require('os').EOL)[0]
try { try {
this._parsedUrl = new URL(this._url) this._parsedUrl = new URL(this._url)
} catch (err) { } catch (err) {
reject({ reject({
err, err,
msg, msg,
}) })
}
this.off('stdout', readyCb)
resolve()
} }
this.off('stdout', readyCb)
resolve()
} }
this.on('stdout', readyCb)
} catch (err) {
require('console').error(`Failed to run ${startArgs.join(' ')}`, err)
setTimeout(() => process.exit(1), 0)
} }
this.on('stdout', readyCb)
}) })
} }
} }
import path from 'path' import path from 'path'
import fs from 'fs-extra' import fs from 'fs-extra'
import { NextInstance } from './base' import { NextInstance } from './base'
import { spawn, SpawnOptions } from 'child_process' import { spawn, SpawnOptions } from 'cross-spawn'
import { Span } from 'next/trace' import { Span } from 'next/trace'
export class NextStartInstance extends NextInstance { export class NextStartInstance extends NextInstance {
...@@ -65,20 +65,26 @@ export class NextStartInstance extends NextInstance { ...@@ -65,20 +65,26 @@ export class NextStartInstance extends NextInstance {
await new Promise<void>((resolve, reject) => { await new Promise<void>((resolve, reject) => {
console.log('running', buildArgs.join(' ')) console.log('running', buildArgs.join(' '))
this.childProcess = spawn(
buildArgs[0], try {
buildArgs.slice(1), this.childProcess = spawn(
this.spawnOpts buildArgs[0],
) buildArgs.slice(1),
this.handleStdio(this.childProcess) this.spawnOpts
this.childProcess.on('exit', (code, signal) => { )
this.childProcess = null this.handleStdio(this.childProcess)
if (code || signal) this.childProcess.on('exit', (code, signal) => {
reject( this.childProcess = null
new Error(`next build failed with code/signal ${code || signal}`) if (code || signal)
) reject(
else resolve() new Error(`next build failed with code/signal ${code || signal}`)
}) )
else resolve()
})
} catch (err) {
require('console').error(`Failed to run ${buildArgs.join(' ')}`, err)
setTimeout(() => process.exit(1), 0)
}
}) })
this._buildId = ( this._buildId = (
...@@ -95,31 +101,38 @@ export class NextStartInstance extends NextInstance { ...@@ -95,31 +101,38 @@ export class NextStartInstance extends NextInstance {
console.log('running', startArgs.join(' ')) console.log('running', startArgs.join(' '))
await new Promise<void>((resolve) => { await new Promise<void>((resolve) => {
this.childProcess = spawn( try {
startArgs[0], this.childProcess = spawn(
startArgs.slice(1), startArgs[0],
this.spawnOpts startArgs.slice(1),
) this.spawnOpts
this.handleStdio(this.childProcess) )
this.handleStdio(this.childProcess)
this.childProcess.on('close', (code, signal) => {
if (this.isStopping) return this.childProcess.on('close', (code, signal) => {
if (code || signal) { if (this.isStopping) return
throw new Error( if (code || signal) {
`next start exited unexpectedly with code/signal ${code || signal}` throw new Error(
) `next start exited unexpectedly with code/signal ${
} code || signal
}) }`
)
}
})
const readyCb = (msg) => { const readyCb = (msg) => {
if (msg.includes('started server on') && msg.includes('url:')) { if (msg.includes('started server on') && msg.includes('url:')) {
this._url = msg.split('url: ').pop().trim() this._url = msg.split('url: ').pop().trim()
this._parsedUrl = new URL(this._url) this._parsedUrl = new URL(this._url)
this.off('stdout', readyCb) this.off('stdout', readyCb)
resolve() resolve()
}
} }
this.on('stdout', readyCb)
} catch (err) {
require('console').error(`Failed to run ${startArgs.join(' ')}`, err)
setTimeout(() => process.exit(1), 0)
} }
this.on('stdout', readyCb)
}) })
} }
......
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