Unverified Commit e2554bc5 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[test] Let pending test finish on abort (#86307)

parent 0469aec4
...@@ -501,10 +501,11 @@ ${ENDGROUP}`) ...@@ -501,10 +501,11 @@ ${ENDGROUP}`)
`jest${process.platform === 'win32' ? '.CMD' : ''}` `jest${process.platform === 'win32' ? '.CMD' : ''}`
) )
let firstError = true let firstError = true
let killed = false const testController = new AbortController()
const testSignal = testController.signal
let hadFailures = false let hadFailures = false
const runTest = (/** @type {TestFile} */ test, isFinalRun, isRetry) => const runTestOnce = (/** @type {TestFile} */ test, isFinalRun, isRetry) =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
const start = new Date().getTime() const start = new Date().getTime()
let outputChunks = [] let outputChunks = []
...@@ -618,11 +619,11 @@ ${ENDGROUP}`) ...@@ -618,11 +619,11 @@ ${ENDGROUP}`)
if (hideOutput) { if (hideOutput) {
await outputSema.acquire() await outputSema.acquire()
const isExpanded = const isExpanded =
firstError && !killed && !shouldContinueTestsOnError firstError && !testSignal.aborted && !shouldContinueTestsOnError
if (isExpanded) { if (isExpanded) {
firstError = false firstError = false
process.stdout.write(`❌ ${test.file} output:\n`) process.stdout.write(`❌ ${test.file} output:\n`)
} else if (killed) { } else if (testSignal.aborted) {
process.stdout.write(`${GROUP}${test.file} output (killed)\n`) process.stdout.write(`${GROUP}${test.file} output (killed)\n`)
} else { } else {
process.stdout.write(`${GROUP}❌ ${test.file} output\n`) process.stdout.write(`${GROUP}❌ ${test.file} output\n`)
...@@ -636,7 +637,7 @@ ${ENDGROUP}`) ...@@ -636,7 +637,7 @@ ${ENDGROUP}`)
output += chunk.toString() output += chunk.toString()
} }
if (process.env.CI && !killed) { if (process.env.CI && !testSignal.aborted) {
errorsPerTests.set(test.file, output) errorsPerTests.set(test.file, output)
} }
...@@ -682,22 +683,7 @@ ${ENDGROUP}`) ...@@ -682,22 +683,7 @@ ${ENDGROUP}`)
}) })
}) })
const directorySemas = new Map() const runTest = async (/** @type {TestFile} */ test) => {
const originalRetries = numRetries
await Promise.all(
tests.map(async (test) => {
const dirName = path.dirname(test.file)
let dirSema = directorySemas.get(dirName)
// we only restrict 1 test per directory for
// legacy integration tests
if (/^test[/\\]integration/.test(test.file) && dirSema === undefined) {
directorySemas.set(dirName, (dirSema = new Sema(1)))
}
if (dirSema) await dirSema.acquire()
await sema.acquire()
let passed = false let passed = false
const shouldSkipRetries = skipRetryTestManifest.find((t) => const shouldSkipRetries = skipRetryTestManifest.find((t) =>
...@@ -713,7 +699,7 @@ ${ENDGROUP}`) ...@@ -713,7 +699,7 @@ ${ENDGROUP}`)
for (let i = 0; i < numRetries + 1; i++) { for (let i = 0; i < numRetries + 1; i++) {
try { try {
console.log(`Starting ${test.file} retry ${i}/${numRetries}`) console.log(`Starting ${test.file} retry ${i}/${numRetries}`)
const time = await runTest( const time = await runTestOnce(
test, test,
shouldSkipRetries || i === numRetries, shouldSkipRetries || i === numRetries,
shouldSkipRetries || i > 0 shouldSkipRetries || i > 0
...@@ -724,9 +710,7 @@ ${ENDGROUP}`) ...@@ -724,9 +710,7 @@ ${ENDGROUP}`)
}) })
passed = true passed = true
console.log( console.log(
`Finished ${test.file} on retry ${i}/${numRetries} in ${ `${test.file} finished on retry ${i}/${numRetries} in ${time / 1000}s`
time / 1000
}s`
) )
break break
} catch (err) { } catch (err) {
...@@ -750,16 +734,16 @@ ${ENDGROUP}`) ...@@ -750,16 +734,16 @@ ${ENDGROUP}`)
} }
if (!passed) { if (!passed) {
console.error( hadFailures = true
const error = new Error(
// "failed to pass within" is a keyword parsed by next-pr-webhook
`${test.file} failed to pass within ${numRetries} retries` `${test.file} failed to pass within ${numRetries} retries`
) )
console.error(error.message)
if (!shouldContinueTestsOnError) { if (!shouldContinueTestsOnError) {
killed = true testController.abort(error)
children.forEach((child) => child.kill())
cleanUpAndExit(1)
} else { } else {
hadFailures = true
console.log( console.log(
`CONTINUE_ON_ERROR enabled, continuing tests after ${test.file} failed` `CONTINUE_ON_ERROR enabled, continuing tests after ${test.file} failed`
) )
...@@ -792,12 +776,54 @@ ${ENDGROUP}`) ...@@ -792,12 +776,54 @@ ${ENDGROUP}`)
console.log(`Failed to load test output`, err) console.log(`Failed to load test output`, err)
} }
} }
}
const directorySemas = new Map()
const originalRetries = numRetries
const results = await Promise.allSettled(
tests.map(async (test) => {
const dirName = path.dirname(test.file)
let dirSema = directorySemas.get(dirName)
// we only restrict 1 test per directory for
// legacy integration tests
if (/^test[/\\]integration/.test(test.file) && dirSema === undefined) {
directorySemas.set(dirName, (dirSema = new Sema(1)))
}
// TODO: Use explicit resource managment instead of this acquire/release pattern
// once CI runs with Node.js 24+.
if (dirSema) await dirSema.acquire()
await sema.acquire()
try {
if (testSignal.aborted) {
// We already logged the abort reason. No need to include it in cause.
const error = new Error(`Skipped due to abort.`)
error.name = test.file
throw error
}
await runTest(test)
} finally {
sema.release() sema.release()
if (dirSema) dirSema.release() if (dirSema) dirSema.release()
}
}) })
) )
for (const result of results) {
if (result.status === 'rejected') {
hadFailures = true
console.error(result.reason)
}
}
if (hadFailures && !shouldContinueTestsOnError) {
// TODO: Does it make sense to update timings if there were failures if without shouldContinueTestsOnError?
return hadFailures
}
if (options.timings) { if (options.timings) {
const curTimings = {} const curTimings = {}
// let junitData = `<testsuites name="jest tests">` // let junitData = `<testsuites name="jest tests">`
...@@ -857,20 +883,20 @@ ${ENDGROUP}`) ...@@ -857,20 +883,20 @@ ${ENDGROUP}`)
} }
} }
// Return whether there were any failures
return hadFailures return hadFailures
} }
main() main().then(
.then((hadFailures) => { (hadFailures) => {
if (hadFailures) { if (hadFailures) {
console.error('Some tests failed') console.error('Some tests failed')
cleanUpAndExit(1) return cleanUpAndExit(1)
} else { } else {
cleanUpAndExit(0) return cleanUpAndExit(0)
} }
}) },
.catch((err) => { (reason) => {
console.error(err) console.error(reason)
cleanUpAndExit(1) return cleanUpAndExit(1)
}) }
)
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