Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

simplify again

Browse source
This commit is contained in:
Simon Knott 2024-12-22 11:45:37 +01:00
parent 6d1dfe18a0
commit 907bfd2c80
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/playwright/src/plugins/webServerPlugin.ts
View file

@ -15,7 +15,6 @@
*/ */
import path from 'path'; import path from 'path';
import net from 'net'; import net from 'net';
import child_process from 'child_process'
import { colors, debug } from 'playwright-core/lib/utilsBundle'; import { colors, debug } from 'playwright-core/lib/utilsBundle';
import { raceAgainstDeadline, launchProcess, monotonicTime, isURLAvailable } from 'playwright-core/lib/utils'; import { raceAgainstDeadline, launchProcess, monotonicTime, isURLAvailable } from 'playwright-core/lib/utils';
@ -125,18 +124,10 @@ export class WebServerPlugin implements TestRunnerPlugin {
if (!signal) if (!signal)
throw new Error('skip graceful shutdown'); throw new Error('skip graceful shutdown');
if (signal === "SIGINT") // proper usage of SIGINT is to send it to the entire process group, see https://www.cons.org/cracauer/sigint.html // proper usage of SIGINT is to send it to the entire process group, see https://www.cons.org/cracauer/sigint.html
process.kill(-launchedProcess.pid!, "SIGINT"); // there's no such convention for SIGTERM, but we follow GNU bash behaviour, which is also sending to the entire process group
else { // SIGTERM is sent to the top process only, which then decides what to do process.kill(-launchedProcess.pid!, signal);
let pid = launchedProcess.pid!;
if (process.platform === "linux") {
for (const webServerPID of this._queryChildProcesses(launchedProcess.pid!))
process.kill(webServerPID, 'SIGTERM');
} else {
process.kill(-pid, "SIGTERM");
}
}
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
const timer = timeout !== 0 const timer = timeout !== 0
? setTimeout(() => reject(new Error(`process didn't close gracefully within timeout, falling back to SIGKILL`)), timeout) ? setTimeout(() => reject(new Error(`process didn't close gracefully within timeout, falling back to SIGKILL`)), timeout)
@ -165,11 +156,6 @@ export class WebServerPlugin implements TestRunnerPlugin {
}); });
} }
private _queryChildProcesses(parentPID: number): number[] {
const output = child_process.execSync(`ps --ppid ${parentPID} -o pid`, { encoding: 'utf-8' });
return output.split("\n").map(l => parseInt(l.trim(), 10)).filter(l => !Number.isNaN(l))
}
private async _waitForProcess() { private async _waitForProcess() {
if (!this._isAvailableCallback) { if (!this._isAvailableCallback) {
this._processExitedPromise.catch(() => {}); this._processExitedPromise.catch(() => {});

7
tests/playwright-test/web-server.spec.ts
View file

@ -755,17 +755,16 @@ test.describe('kill option', () => {
'child.js': ` 'child.js': `
process.on('SIGINT', () => { console.log('%%childprocess received SIGINT'); setTimeout(() => process.exit(), 10) }) process.on('SIGINT', () => { console.log('%%childprocess received SIGINT'); setTimeout(() => process.exit(), 10) })
process.on('SIGTERM', () => { console.log('%%childprocess received SIGTERM'); setTimeout(() => process.exit(), 10) }) process.on('SIGTERM', () => { console.log('%%childprocess received SIGTERM'); setTimeout(() => process.exit(), 10) })
process.on('message', msg => console.log(msg)) process.on('message', () => {}) // somehow, this line is needed to receive signals in a forked child process
`, `,
'web-server.js': ` 'web-server.js': `
const child = require("node:child_process").fork('./child.js', { silent: false }) require("node:child_process").fork('./child.js', { silent: false })
process.on('SIGINT', () => { process.on('SIGINT', () => {
console.log('%%webserver received SIGINT but stubbornly refuses to wind down') console.log('%%webserver received SIGINT but stubbornly refuses to wind down')
}) })
process.on('SIGTERM', () => { process.on('SIGTERM', () => {
console.log('%%webserver received SIGTERM but stubbornly refuses to wind down') console.log('%%webserver received SIGTERM but stubbornly refuses to wind down')
child.kill('SIGINT')
}) })
const server = require("node:http").createServer((req, res) => { res.end("ok"); }) const server = require("node:http").createServer((req, res) => { res.end("ok"); })
@ -801,7 +800,7 @@ test.describe('kill option', () => {
test('can be configured to send SIGTERM', async ({ runInlineTest }) => { test('can be configured to send SIGTERM', async ({ runInlineTest }) => {
const result = await runInlineTest(files({ kill: { SIGTERM: 500 } }), { workers: 1 }); const result = await runInlineTest(files({ kill: { SIGTERM: 500 } }), { workers: 1 });
expect(parseOutputLines(result)).toEqual(['webserver received SIGTERM but stubbornly refuses to wind down', 'childprocess received SIGINT']); expect(parseOutputLines(result).sort()).toEqual(['childprocess received SIGTERM', 'webserver received SIGTERM but stubbornly refuses to wind down']);
}); });
test('can be configured to send SIGINT', async ({ runInlineTest }) => { test('can be configured to send SIGINT', async ({ runInlineTest }) => {