Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup automation

Browse Source
This commit is contained in:
Benjamin Pasero
2021-12-09 07:03:29 +01:00
parent 6897670596
commit acc0803f38
5 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/automation/src/application.ts
+3 -3
View File
@@ -6,7 +6,7 @@
import * as fs from 'fs';
import * as path from 'path';
import { Workbench } from './workbench';
import { Code, spawn, SpawnOptions } from './code';
import { Code, launch, LaunchOptions } from './code';
import { Logger, measureAndLog } from './logger';
export const enum Quality {
@@ -15,7 +15,7 @@ export const enum Quality {
Stable
}
export interface ApplicationOptions extends SpawnOptions {
export interface ApplicationOptions extends LaunchOptions {
quality: Quality;
workspacePath: string;
waitTime: number;
@@ -112,7 +112,7 @@ export class Application {
}
private async startApplication(extraArgs: string[] = []): Promise<Code> {
const code = this._code = await spawn({
const code = this._code = await launch({
...this.options,
extraArgs: [...(this.options.extraArgs || []), ...extraArgs],
});
test/automation/src/code.ts
+6 -17
View File
@@ -14,7 +14,7 @@ import { copyExtension } from './extensions';
const repoPath = path.join(__dirname, '../../..');
export interface SpawnOptions {
export interface LaunchOptions {
codePath?: string;
workspacePath: string;
userDataDir: string;
@@ -26,7 +26,6 @@ export interface SpawnOptions {
web?: boolean;
headless?: boolean;
browser?: 'chromium' | 'webkit' | 'firefox';
testTitle?: string;
}
let stopped = false;
@@ -34,7 +33,7 @@ process.on('exit', () => stopped = true);
process.on('SIGINT', () => stopped = true);
process.on('SIGTERM', () => stopped = true);
export async function spawn(options: SpawnOptions): Promise<Code> {
export async function launch(options: LaunchOptions): Promise<Code> {
if (stopped) {
throw new Error('Smoke test process has terminated, refusing to spawn Code');
}
@@ -43,22 +42,12 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
// Browser smoke tests
if (options.web) {
return spawnBrowser(options);
const { serverProcess, client, driver } = await launchPlaywright(options);
return new Code(client, driver, options.logger, serverProcess);
}
// Electron smoke tests
return spawnElectron(options);
}
async function spawnBrowser(options: SpawnOptions): Promise<Code> {
const { serverProcess, client, driver } = await launchPlaywright(options.codePath, options.userDataDir, options.extensionsPath, options.workspacePath, Boolean(options.verbose), options, options.logger);
return new Code(client, driver, options.logger, serverProcess);
}
async function spawnElectron(options: SpawnOptions): Promise<Code> {
const { electronProcess, client, driver } = await launchElectron(options.codePath, options.userDataDir, options.extensionsPath, options.workspacePath, Boolean(options.verbose), Boolean(options.remote), options.extraArgs, options.logger);
const { electronProcess, client, driver } = await launchElectron(options);
return new Code(client, driver, options.logger, electronProcess);
}
@@ -110,7 +99,7 @@ export class Code {
private readonly mainProcess: cp.ChildProcess
) {
this.driver = new Proxy(driver, {
get(target, prop, receiver) {
get(target, prop) {
if (typeof prop === 'symbol') {
throw new Error('Invalid usage');
}
test/automation/src/electronDriver.ts
+4 -2
View File
@@ -13,11 +13,13 @@ import { promisify } from 'util';
import * as kill from 'tree-kill';
import { copyExtension } from './extensions';
import { URI } from 'vscode-uri';
import { Logger, measureAndLog } from './logger';
import { measureAndLog } from './logger';
import type { LaunchOptions } from './code';
const repoPath = path.join(__dirname, '../../..');
export async function launch(codePath: string | undefined, userDataDir: string, extensionsPath: string, workspacePath: string, verbose: boolean, remote: boolean, extraArgs: string[] | undefined, logger: Logger): Promise<{ electronProcess: ChildProcess, client: IDisposable, driver: IDriver }> {
export async function launch(options: LaunchOptions): Promise<{ electronProcess: ChildProcess, client: IDisposable, driver: IDriver }> {
const { codePath, workspacePath, extensionsPath, userDataDir, remote, logger, verbose, extraArgs } = options;
const env = { ...process.env };
const logsPath = path.join(repoPath, '.build', 'logs', remote ? 'smoke-tests-remote' : 'smoke-tests');
const outPath = codePath ? getBuildOutPath(codePath) : getDevOutPath();
test/automation/src/playwrightDriver.ts
+10 -11
View File
@@ -13,6 +13,7 @@ import { URI } from 'vscode-uri';
import * as kill from 'tree-kill';
import { PageFunction } from 'playwright-core/types/structs';
import { Logger, measureAndLog } from './logger';
import type { LaunchOptions } from './code';
const width = 1200;
const height = 800;
@@ -198,29 +199,26 @@ class PlaywrightDriver implements IDriver {
let port = 9000;
export interface PlaywrightOptions {
readonly browser?: 'chromium' | 'webkit' | 'firefox';
readonly headless?: boolean;
}
export async function launch(codeServerPath = process.env.VSCODE_REMOTE_SERVER_PATH, userDataDir: string, extensionsPath: string, workspacePath: string, verbose: boolean, options: PlaywrightOptions = {}, logger: Logger): Promise<{ serverProcess: ChildProcess, client: IDisposable, driver: IDriver }> {
export async function launch(options: LaunchOptions): Promise<{ serverProcess: ChildProcess, client: IDisposable, driver: IDriver }> {
// Launch server
const { serverProcess, endpoint } = await launchServer(userDataDir, codeServerPath, extensionsPath, verbose, logger);
const { serverProcess, endpoint } = await launchServer(options);
// Launch browser
const { browser, context, page } = await launchBrowser(options, endpoint, workspacePath, logger);
const { browser, context, page } = await launchBrowser(options, endpoint);
return {
serverProcess,
client: {
dispose: () => { /* there is no client to dispose for browser, teardown is triggered via exitApplication call */ }
},
driver: new PlaywrightDriver(serverProcess, browser, context, page, logger)
driver: new PlaywrightDriver(serverProcess, browser, context, page, options.logger)
};
}
async function launchServer(userDataDir: string, codeServerPath: string | undefined, extensionsPath: string, verbose: boolean, logger: Logger) {
async function launchServer(options: LaunchOptions) {
const { userDataDir, codePath, extensionsPath, verbose, logger } = options;
const codeServerPath = codePath ?? process.env.VSCODE_REMOTE_SERVER_PATH;
const agentFolder = userDataDir;
await measureAndLog(promisify(mkdir)(agentFolder), `mkdir(${agentFolder})`, logger);
const env = {
@@ -274,7 +272,8 @@ async function launchServer(userDataDir: string, codeServerPath: string | undefi
};
}
async function launchBrowser(options: PlaywrightOptions, endpoint: string, workspacePath: string, logger: Logger) {
async function launchBrowser(options: LaunchOptions, endpoint: string) {
const { logger, workspacePath } = options;
const browser = await measureAndLog(playwright[options.browser ?? 'chromium'].launch({ headless: options.headless ?? false }), 'playwright#launch', logger);
const context = await measureAndLog(browser.newContext(), 'browser.newContext', logger);