Skip to content

test: refactor WPTRunner and enable parallel WPT execution #47635

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.

Sign up for GitHub

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

Merged
nodejs-github-bot merged 5 commits into from
Apr 25, 2023
Merged

test: refactor WPTRunner and enable parallel WPT execution #47635

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
505b768
test: refactor WPTRunner and enable parallel WPT execution
panva Apr 19, 2023
0661e23
fixup! test: refactor WPTRunner and enable parallel WPT execution
panva Apr 25, 2023
5b7ff31
fixup! test: refactor WPTRunner and enable parallel WPT execution
panva Apr 25, 2023
34c4ffe
fixup! test: refactor WPTRunner and enable parallel WPT execution
panva Apr 25, 2023
ecd22cb
fixup! test: refactor WPTRunner and enable parallel WPT execution
panva Apr 25, 2023
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
Prev Previous commit
Next Next commit
fixup! test: refactor WPTRunner and enable parallel WPT execution
  • Loading branch information
@panva
panva committed Apr 25, 2023
commit 0661e231e60098b964de25f412527d8cd5c9880b
30 changes: 14 additions & 16 deletions test/common/wpt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,7 @@ class WPTRunner {

this.status = new StatusLoader(path);
this.status.load();
this.specMap = new Map(
this.status.specs.map((item) => [item.id, item]),
);
this.specs = new Set(this.status.specs);

this.results = {};
this.inProgress = new Set();
Expand Down Expand Up @@ -642,8 +640,8 @@ class WPTRunner {
needsGc: !!meta.script?.find((script) => script === '/common/gc.js'),
},
});
this.inProgress.add(spec.id);
this.workers.set(spec.id, worker);
this.inProgress.add(spec);
this.workers.set(spec, worker);

let reportResult;
worker.on('message', (message) => {
Expand All @@ -659,7 +657,7 @@ class WPTRunner {
});

worker.on('error', (err) => {
if (!this.inProgress.has(spec.id)) {
if (!this.inProgress.has(spec)) {
// The test is already finished. Ignore errors that occur after it.
// This can happen normally, for example in timers tests.
return;
Expand All @@ -674,7 +672,7 @@ class WPTRunner {
},
kUncaught,
);
this.inProgress.delete(spec.id);
this.inProgress.delete(spec);
});

await events.once(worker, 'exit').catch(() => {});
Expand All @@ -684,7 +682,7 @@ class WPTRunner {
process.on('exit', () => {
if (this.inProgress.size > 0) {
for (const id of this.inProgress) {
const spec = this.specMap.get(id);
const spec = this.specs.get(id);
this.fail(spec, { name: 'Unknown' }, kIncomplete);
}
}
Expand Down Expand Up @@ -715,11 +713,11 @@ class WPTRunner {
}

const unexpectedPasses = [];
for (const specMap of queue) {
const key = specMap.filename;
for (const specs of queue) {
const key = specs.filename;

// File has no expected failures
if (!specMap.failedTests.length) {
if (!specs.failedTests.length) {
continue;
}

Expand All @@ -729,8 +727,8 @@ class WPTRunner {
}

// Full check: every expected to fail test is present
if (specMap.failedTests.some((expectedToFail) => {
if (specMap.flakyTests.includes(expectedToFail)) {
if (specs.failedTests.some((expectedToFail) => {
if (specs.flakyTests.includes(expectedToFail)) {
return false;
}
return this.results[key]?.fail?.expected?.includes(expectedToFail) !== true;
Expand Down Expand Up @@ -808,10 +806,10 @@ class WPTRunner {
if (harnessStatus.status === 2) {
this.resultCallback(spec, { status: 2, name: 'Unknown' });
}
this.inProgress.delete(spec.id);
this.inProgress.delete(spec);
// Always force termination of the worker. Some tests allocate resources
// that would otherwise keep it alive.
this.workers.get(spec.id).terminate();
this.workers.get(spec).terminate();
}

addTestResult(spec, item) {
Expand Down Expand Up @@ -885,7 +883,7 @@ class WPTRunner {
if (process.argv[2]) {
([argFilename, argVariant = ''] = process.argv[2].split('?'));
}
for (const spec of this.specMap.values()) {
for (const spec of this.specs.values()) {
if (argFilename) {
if (spec.filename === argFilename && (!argVariant || spec.variant.substring(1) === argVariant)) {
queue.push(spec);
Expand Down