-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve developer experience for web platform tests
* Fix process shutdown on Windows to work consistently. * Filter the logs a bit to make them more readable. * Don't require manually marking .worker/.sharedworker/serviceworker variants as skipped in to-run.yaml.
- Loading branch information
Showing
7 changed files
with
136 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| "use strict"; | ||
| /* eslint-disable no-console, global-require */ | ||
| const dns = require("dns").promises; | ||
| const path = require("path"); | ||
| const childProcess = require("child_process"); | ||
| const http = require("http"); | ||
| const https = require("https"); | ||
| const os = require("os"); | ||
|
|
||
| const wptDir = path.resolve(__dirname, "tests"); | ||
|
|
||
| const configPaths = { | ||
| default: path.resolve(__dirname, "wpt-config.json"), | ||
| toUpstream: path.resolve(__dirname, "tuwpt-config.json") | ||
| }; | ||
|
|
||
| const configs = { | ||
| default: require(configPaths.default), | ||
| toUpstream: require(configPaths.toUpstream) | ||
| }; | ||
|
|
||
| exports.start = async ({ toUpstream = false } = {}) => { | ||
| const configType = toUpstream ? "toUpstream" : "default"; | ||
| const configPath = configPaths[configType]; | ||
| const config = configs[configType]; | ||
|
|
||
| try { | ||
| await dns.lookup("web-platform.test"); | ||
| } catch { | ||
| throw new Error("Host entries not present for web platform tests. See " + | ||
| "https://web-platform-tests.org/running-tests/from-local-system.html#system-setup"); | ||
| } | ||
|
|
||
| const configArg = path.relative(path.resolve(wptDir), configPath); | ||
| const args = ["./wpt.py", "serve", "--config", configArg]; | ||
| const subprocess = childProcess.spawn("python", args, { | ||
| cwd: wptDir, | ||
| stdio: ["inherit", "pipe", "pipe"] | ||
| }); | ||
|
|
||
| subprocess.stdout.filter(nonSpammyWPTLog).pipe(process.stdout); | ||
| subprocess.stderr.filter(nonSpammyWPTLog).pipe(process.stderr); | ||
|
|
||
| return new Promise((resolve, reject) => { | ||
| subprocess.on("error", e => { | ||
| reject(new Error("Error starting python server process:", e.message)); | ||
| }); | ||
|
|
||
| resolve(Promise.all([ | ||
| pollForServer(`http://${config.browser_host}:${config.ports.http[0]}/`), | ||
| pollForServer(`https://${config.browser_host}:${config.ports.https[0]}/`), | ||
| pollForServer(`http://${config.browser_host}:${config.ports.ws[0]}/`), | ||
| pollForServer(`https://${config.browser_host}:${config.ports.wss[0]}/`) | ||
| ]).then(urls => ({ urls, subprocess }))); | ||
| }); | ||
| }; | ||
|
|
||
| exports.kill = subprocess => { | ||
| if (os.platform() === "win32") { | ||
| // subprocess.kill() doesn't seem to be able to kill descendant processes on Windows, at least with whatever's going | ||
| // on inside the web-platform-tests Python. Use this technique instead. | ||
| childProcess.spawnSync("taskkill", ["/F", "/T", "/PID", subprocess.pid], { detached: true, windowsHide: true }); | ||
| } else { | ||
| // SIGINT is necessary so that the Python script can clean up its subprocesses. | ||
| subprocess.kill("SIGINT"); | ||
| } | ||
| }; | ||
|
|
||
| function pollForServer(url, lastLogTime = Date.now()) { | ||
| const agent = url.startsWith("https") ? new https.Agent({ rejectUnauthorized: false }) : null; | ||
| const { request } = url.startsWith("https") ? https : http; | ||
|
|
||
| // Using raw Node.js http/https modules is gross, but it's not worth pulling in something like node-fetch for just | ||
| // this one part of the test codebase. | ||
| return new Promise((resolve, reject) => { | ||
| const req = request(url, { method: "HEAD", agent }, res => { | ||
| if (res.statusCode < 200 || res.statusCode > 299) { | ||
| reject(new Error(`Unexpected status=${res.statusCode}`)); | ||
| } else { | ||
| resolve(url); | ||
| } | ||
| }); | ||
|
|
||
| req.on("error", reject); | ||
| req.end(); | ||
| }).catch(err => { | ||
| // Only log every 5 seconds to be less spammy. | ||
| if (Date.now() - lastLogTime >= 5000) { | ||
| console.log(`WPT server at ${url} is not up yet (${err.message}); trying again`); | ||
| lastLogTime = Date.now(); | ||
| } | ||
|
|
||
| return new Promise(resolve => { | ||
| setTimeout(() => resolve(pollForServer(url, lastLogTime)), 500); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| function nonSpammyWPTLog(buffer) { | ||
| const string = buffer.toString("utf-8"); | ||
|
|
||
| // Subprocess shutdown is uninteresting. | ||
| if (string.includes("Status of subprocess")) { | ||
| return false; | ||
| } | ||
| if (string.includes("INFO - Stopped")) { | ||
| return false; | ||
| } | ||
|
|
||
| // We'll get one message for each server startup. We don't need four more. | ||
| if (string.includes("INFO - Close on:") || | ||
| string.includes("INFO - Bind on:") || | ||
| string.includes("INFO - Listen on:") || | ||
| string.includes("INFO - Create socket on:")) { | ||
| return false; | ||
| } | ||
|
|
||
| // Probing / on the ws and wss ports will cause a fallback, and log some messages about it. | ||
| // Those are expected and are uninteresting. | ||
| if (/wss? on port \d+\] INFO - (No handler|Fallback to|"HEAD \/ HTTP)/.test(string)) { | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } |