Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(wpt): mark timed out tests as 'failed' #2644

Merged
merged 5 commits into from
Feb 6, 2024
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 53 additions & 31 deletions test/wpt/runner/runner.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,13 @@ export class WPTRunner extends EventEmitter {
#reportPath

#stats = {
completed: 0,
failed: 0,
success: 0,
subtestsCompleted: 0,
subtestsFailed: 0,
subtestsPassed: 0,
expectedFailures: 0,
skipped: 0
testsFailed: 0,
testsPassed: 0,
testsSkipped: 0
}

constructor (folder, url, { appendReport = false, reportPath } = {}) {
Expand Down Expand Up @@ -158,7 +160,7 @@ export class WPTRunner extends EventEmitter {
const status = resolveStatusPath(test, this.#status)

if (status.file.skip || status.topLevel.skip) {
this.#stats.skipped += 1
this.#stats.testsSkipped += 1

console.log(colors(`[${finishedFiles}/${total}] SKIPPED - ${test}`, 'yellow'))
console.log('='.repeat(96))
Expand Down Expand Up @@ -187,19 +189,19 @@ export class WPTRunner extends EventEmitter {
}
})

let result, report
const fileUrl = new URL(`/${this.#folderName}${test.slice(this.#folderPath.length)}`, 'http://wpt')
fileUrl.pathname = fileUrl.pathname.replace(/\.js$/, '.html')
fileUrl.search = variant
const result = {
test: fileUrl.href.slice(fileUrl.origin.length),
subtests: [],
status: ''
}

let report
if (this.#appendReport) {
report = JSON.parse(readFileSync(this.#reportPath))

const fileUrl = new URL(`/${this.#folderName}${test.slice(this.#folderPath.length)}`, 'http://wpt')
fileUrl.pathname = fileUrl.pathname.replace(/\.js$/, '.html')
fileUrl.search = variant

result = {
test: fileUrl.href.slice(fileUrl.origin.length),
subtests: [],
status: 'OK'
}
result.status = 'OK'
report.results.push(result)
}

Expand All @@ -214,8 +216,8 @@ export class WPTRunner extends EventEmitter {
this.handleTestCompletion(worker)
} else if (message.type === 'error') {
this.#uncaughtExceptions.push({ error: message.error, test })
this.#stats.failed += 1
this.#stats.success -= 1
this.#stats.subtestsFailed += 1
this.#stats.subtestsPassed -= 1
}
})

Expand All @@ -224,14 +226,27 @@ export class WPTRunner extends EventEmitter {
signal: AbortSignal.timeout(timeout)
})

console.log(colors(`[${finishedFiles}/${total}] PASSED - ${test}`, 'green'))
if (result?.subtests.every((subtest) => subtest.status === 'PASS')) {
this.#stats.testsPassed += 1
console.log(colors(`[${finishedFiles}/${total}] PASSED - ${test}`, 'green'))
} else {
this.#stats.testsFailed += 1
console.log(colors(`[${finishedFiles}/${total}] FAILED - ${test}`, 'red'))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests can have expected failures, marking the entire file as failing isn't the correct behavior here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @KhafraDev and thank you for your review! Sorry, I hadn't considered this scenario. I'll try and fix that 😁

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @KhafraDev, I changed the logic for marking a Test File as failed. Now, a Test File fails if one of its tests fails without being an expected failure. Let me know if it is acceptable or if further changes are needed.

Thank you in advance!

}

if (variant) console.log('Variant:', variant)
console.log(`Test took ${(performance.now() - start).toFixed(2)}ms`)
console.log('='.repeat(96))
} catch (e) {
console.log(`${test} timed out after ${timeout}ms`)
// If the worker is terminated by the timeout signal, the test is marked as failed
this.#stats.testsFailed += 1
console.log(colors(`[${finishedFiles}/${total}] FAILED - ${test}`, 'red'))

if (variant) console.log('Variant:', variant)
console.log(`Test timed out after ${timeout}ms`)
console.log('='.repeat(96))
} finally {
if (result?.subtests.length > 0) {
if (this.#appendReport && result?.subtests.length > 0) {
writeFileSync(this.#reportPath, JSON.stringify(report))
}

Expand All @@ -245,16 +260,16 @@ export class WPTRunner extends EventEmitter {
}

/**
* Called after a test has succeeded or failed.
* Called after a subtest has succeeded or failed.
*/
handleIndividualTestCompletion (message, status, path, meta, wptResult) {
const { file, topLevel } = status

if (message.type === 'result') {
this.#stats.completed += 1
this.#stats.subtestsCompleted += 1

if (message.result.status === 1) {
this.#stats.failed += 1
this.#stats.subtestsFailed += 1

wptResult?.subtests.push({
status: 'FAIL',
Expand Down Expand Up @@ -284,7 +299,7 @@ export class WPTRunner extends EventEmitter {
status: 'PASS',
name: sanitizeUnpairedSurrogates(message.result.name)
})
this.#stats.success += 1
this.#stats.subtestsPassed += 1
}
}
}
Expand All @@ -307,16 +322,23 @@ export class WPTRunner extends EventEmitter {
}

this.emit('completion')
const { completed, failed, success, expectedFailures, skipped } = this.#stats

const { testsPassed, testsFailed, testsSkipped } = this.#stats
console.log(
`Test results for folder [${this.#folderName}]: ` +
KhafraDev marked this conversation as resolved.
Show resolved Hide resolved
`completed: ${this.#files.length}, passed: ${testsPassed}, failed: ${testsFailed}, ` +
`skipped: ${testsSkipped}`
)

const { subtestsCompleted, subtestsFailed, subtestsPassed, expectedFailures } = this.#stats
KhafraDev marked this conversation as resolved.
Show resolved Hide resolved
console.log(
`[${this.#folderName}]: ` +
`completed: ${completed}, failed: ${failed}, success: ${success}, ` +
`Subtest results for folder [${this.#folderName}]: ` +
`completed: ${subtestsCompleted}, failed: ${subtestsFailed}, passed: ${subtestsPassed}, ` +
`expected failures: ${expectedFailures}, ` +
`unexpected failures: ${failed - expectedFailures}, ` +
`skipped: ${skipped}`
`unexpected failures: ${subtestsFailed - expectedFailures}`
)

process.exit(failed - expectedFailures ? 1 : process.exitCode)
process.exit(subtestsPassed - expectedFailures ? 1 : process.exitCode)
}

addInitScript (code) {
Expand Down
Loading