yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(test-runner): launch -> webServer (#9167)

Browse Source
This commit is contained in:
Max Schmitt 2021-09-27 11:32:57 +02:00 committed by GitHub
parent 0801a8c486
commit 4573ce0cf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/webServer.ts
View File

@ -28,7 +28,7 @@ const DEFAULT_ENVIRONMENT_VARIABLES = {
const newProcessLogPrefixer = () => new stream.Transform({ const newProcessLogPrefixer = () => new stream.Transform({
transform(this: stream.Transform, chunk: Buffer, encoding: string, callback: stream.TransformCallback) { transform(this: stream.Transform, chunk: Buffer, encoding: string, callback: stream.TransformCallback) {
this.push(chunk.toString().split(os.EOL).map((line: string): string => line ? `[Launch] ${line}` : line).join(os.EOL)); this.push(chunk.toString().split(os.EOL).map((line: string): string => line ? `[WebServer] ${line}` : line).join(os.EOL));
callback(); callback();
}, },
}); });
@ -58,7 +58,7 @@ export class WebServer {
if (portIsUsed) { if (portIsUsed) {
if (this.config.reuseExistingServer) if (this.config.reuseExistingServer)
return; return;
throw new Error(`Port ${this.config.port} is used, make sure that nothing is running on the port or set strict:false in config.launch.`); throw new Error(`Port ${this.config.port} is used, make sure that nothing is running on the port or set strict:false in config.webServer.`);
} }
const { launchedProcess, kill } = await launchProcess({ const { launchedProcess, kill } = await launchProcess({
@ -73,7 +73,7 @@ export class WebServer {
shell: true, shell: true,
attemptToGracefullyClose: async () => {}, attemptToGracefullyClose: async () => {},
log: () => {}, log: () => {},
onExit: code => processExitedReject(new Error(`Process from config.launch was not able to start. Exit code: ${code}`)), onExit: code => processExitedReject(new Error(`Process from config.webServer was not able to start. Exit code: ${code}`)),
tempDirectories: [], tempDirectories: [],
}); });
this._killProcess = kill; this._killProcess = kill;
@ -97,7 +97,7 @@ export class WebServer {
])); ]));
cancellationToken.canceled = true; cancellationToken.canceled = true;
if (timedOut) if (timedOut)
throw new Error(`Timed out waiting ${launchTimeout}ms from config.launch.`); throw new Error(`Timed out waiting ${launchTimeout}ms from config.webServer.`);
} }
public async kill() { public async kill() {
await this._killProcess?.(); await this._killProcess?.();

4
tests/playwright-test/web-server.spec.ts
View File

@ -130,7 +130,7 @@ test('should time out waiting for a server', async ({ runInlineTest }, { workerI
`, `,
}); });
expect(result.exitCode).toBe(1); expect(result.exitCode).toBe(1);
expect(result.output).toContain(`Timed out waiting 100ms from config.launch.`); expect(result.output).toContain(`Timed out waiting 100ms from config.webServer.`);
}); });
test('should be able to specify the baseURL without the server', async ({ runInlineTest }, { workerIndex }) => { test('should be able to specify the baseURL without the server', async ({ runInlineTest }, { workerIndex }) => {
@ -190,7 +190,7 @@ test('should be able to use an existing server when reuseExistingServer:true ',
}); });
expect(result.exitCode).toBe(0); expect(result.exitCode).toBe(0);
expect(result.passed).toBe(1); expect(result.passed).toBe(1);
expect(result.output).not.toContain('[Launch] '); expect(result.output).not.toContain('[WebServer] ');
expect(result.report.suites[0].specs[0].tests[0].results[0].status).toContain('passed'); expect(result.report.suites[0].specs[0].tests[0].results[0].status).toContain('passed');
await new Promise(resolve => server.close(resolve)); await new Promise(resolve => server.close(resolve));
}); });