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

allow disabling

Browse source
This commit is contained in:
Simon Knott 2024-11-06 14:11:48 +01:00
parent 9480b7cdfd
commit 8c341d1499
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 46 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,9 @@ export class WebServerPlugin implements TestRunnerPlugin {
if (process.platform === 'win32') if (process.platform === 'win32')
throw new Error('Graceful shutdown is not supported on Windows'); throw new Error('Graceful shutdown is not supported on Windows');
if (this._options.shutdownTimeout === 0)
throw new Error('skip graceful shutdown');
const success = launchedProcess.kill('SIGINT'); const success = launchedProcess.kill('SIGINT');
if (!success) if (!success)
throw new Error(`SIGINT didn't succeed, fall back to non-graceful shutdown`); throw new Error(`SIGINT didn't succeed, fall back to non-graceful shutdown`);

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

@ -745,36 +745,52 @@ test('should forward stdout when set to "pipe" before server is ready', async ({
expect(result.output).not.toContain('Timed out waiting 3000ms'); expect(result.output).not.toContain('Timed out waiting 3000ms');
}); });
test('should gracefully kill server', async ({ interactWithTestRunner }, { workerIndex }) => { test.describe('graceful shutdown', () => {
test.skip(process.platform === 'win32', 'No sending SIGINT on Windows'); test.skip(process.platform === 'win32', 'No sending SIGINT on Windows');
const port = workerIndex * 2 + 10510; const files = (additionalOptions = {}) => {
const port = test.info().workerIndex * 2 + 10510;
return {
'web-server.js': `
process.on('SIGINT', () => { console.log('%%webserver received SIGINT but stubbornly refuses to wind down') })
const server = require('http').createServer((req, res) => { res.end("ok"); })
server.listen(process.argv[2], () => { console.log('webserver started'); });
`,
'test.spec.ts': `
import { test, expect } from '@playwright/test';
test('pass', async ({}) => {});
`,
'playwright.config.ts': `
module.exports = {
webServer: {
command: 'node web-server.js ${port}',
port: ${port},
stdout: 'pipe',
timeout: 3000,
...${JSON.stringify(additionalOptions)}
},
};
`,
};
};
const testProcess = await interactWithTestRunner({ test('sends SIGINT by default', async ({ interactWithTestRunner }) => {
'web-server.js': ` const testProcess = await interactWithTestRunner(files(), { workers: 1 });
process.on('SIGINT', () => { console.log('%%webserver received SIGINT but stubbornly refuses to wind down') })
const server = require('http').createServer((req, res) => { res.end("ok"); })
server.listen(process.argv[2], () => { console.log('webserver started'); });
`,
'test.spec.ts': `
import { test, expect } from '@playwright/test';
test('pass', async ({}) => {});
`,
'playwright.config.ts': `
module.exports = {
webServer: {
command: 'node web-server.js ${port}',
port: ${port},
stdout: 'pipe',
timeout: 3000,
},
};
`,
}, { workers: 1 });
await testProcess.waitForOutput('webserver started'); await testProcess.waitForOutput('webserver started');
process.kill(testProcess.process.pid!, 'SIGINT'); process.kill(testProcess.process.pid!, 'SIGINT');
await testProcess.exited; await testProcess.exited;
expect(testProcess.outputLines({ prefix: '[WebServer] ' })).toEqual(['webserver received SIGINT but stubbornly refuses to wind down']); expect(testProcess.outputLines({ prefix: '[WebServer] ' })).toEqual(['webserver received SIGINT but stubbornly refuses to wind down']);
});
test('can be disabled', async ({ interactWithTestRunner }) => {
const testProcess = await interactWithTestRunner(files({ shutdownTimeout: 0 }), { workers: 1 });
await testProcess.waitForOutput('webserver started');
process.kill(testProcess.process.pid!, 'SIGINT');
await testProcess.exited;
expect(testProcess.outputLines({ prefix: '[WebServer] ' })).toEqual([]);
});
}); });