Merge from vscode ad407028575a77ea387eb7cc219b323dc017b686

test/automation/src/extensions.ts

@@ -34,10 +34,9 @@ export class Extensions extends Viewlet {
 		await this.code.waitForTypeInEditor(SEARCH_BOX, `@id:${id}`);
 	}
 
-	async installExtension(id: string, name: string, version: string, publisherDisplayName: string): Promise<void> {
+	async installExtension(id: string): Promise<void> {
 		await this.searchForExtension(id);
-		const ariaLabel = `${name}, ${version}, ${publisherDisplayName}, press enter for extension details.`;
-		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${ariaLabel}"] .extension-list-item li[class='action-item'] .extension-action.install`);
+		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[data-extension-id="${id}"] .extension-list-item li[class='action-item'] .extension-action.install`);
 		await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action.uninstall`);
 	}
 }

test/integration/browser/src/index.ts

@@ -29,7 +29,9 @@ if (optimist.argv.help) {
 const width = 1200;
 const height = 800;
 
-async function runTestsInBrowser(browserType: 'chromium' | 'firefox' | 'webkit', endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> {
+type BrowserType = 'chromium' | 'firefox' | 'webkit';
+
+async function runTestsInBrowser(browserType: BrowserType, endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> {
 	const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
 	const browser = await playwright[browserType].launch({ headless: !Boolean(optimist.argv.debug), args });
 	const context = await browser.newContext();
@@ -78,7 +80,7 @@ function pkill(pid: number): Promise<void> {
 	});
 }
 
-async function launchServer(): Promise<{ endpoint: url.UrlWithStringQuery, server: cp.ChildProcess }> {
+async function launchServer(browserType: BrowserType): Promise<{ endpoint: url.UrlWithStringQuery, server: cp.ChildProcess }> {
 
 	// Ensure a tmp user-data-dir is used for the tests
 	const tmpDir = tmp.dirSync({ prefix: 't' });
@@ -89,6 +91,7 @@ async function launchServer(): Promise<{ endpoint: url.UrlWithStringQuery, serve
 
 	const env = {
 		VSCODE_AGENT_FOLDER: userDataDir,
+		VSCODE_BROWSER: browserType,
 		...process.env
 	};
 
@@ -130,7 +133,7 @@ async function launchServer(): Promise<{ endpoint: url.UrlWithStringQuery, serve
 	});
 }
 
-launchServer().then(async ({ endpoint, server }) => {
+launchServer(optimist.argv.browser).then(async ({ endpoint, server }) => {
 	return runTestsInBrowser(optimist.argv.browser, endpoint, server);
 }, error => {
 	console.error(error);

test/smoke/src/areas/extensions/extensions.test.ts

@@ -17,7 +17,7 @@ export function setup() {
 
 			await app.workbench.extensions.openExtensionsViewlet();
 
-			await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', 'vscode-smoketest-check', '0.0.1', 'Michel Kaporin');
+			await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check');
 
 			await app.workbench.extensions.waitForExtensionsViewlet();
 

test/smoke/src/areas/workbench/localization.test.ts

@@ -6,7 +6,7 @@
 import { Application, Quality } from '../../../../automation';
 
 export function setup() {
-	describe.skip('Localization', () => {
+	describe('Localization', () => {
 		before(async function () {
 			const app = this.app as Application;
 
@@ -15,7 +15,7 @@ export function setup() {
 			}
 
 			await app.workbench.extensions.openExtensionsViewlet();
-			await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de', 'German Language Pack for Visual Studio Code', '1.47.3', 'Microsoft');
+			await app.workbench.extensions.installExtension('ms-ceintl.vscode-language-pack-de');
 
 			await app.restart({ extraArgs: ['--locale=DE'] });
 		});

test/smoke/test/index.js

@@ -7,13 +7,14 @@ const path = require('path');
 const Mocha = require('mocha');
 const minimist = require('minimist');
 
-const suite = 'Smoke Tests';
-
 const [, , ...args] = process.argv;
 const opts = minimist(args, {
+	boolean: 'web',
 	string: ['f', 'g']
 });
 
+const suite = opts['web'] ? 'Browser Smoke Tests' : 'Smoke Tests';
+
 const options = {
 	color: true,
 	timeout: 60000,
@@ -27,7 +28,7 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
-			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
 		}
 	};
 }

test/unit/browser/index.js

@@ -10,6 +10,7 @@ const glob = require('glob');
 const fs = require('fs');
 const events = require('events');
 const mocha = require('mocha');
+const MochaJUnitReporter = require('mocha-junit-reporter');
 const url = require('url');
 const minimatch = require('minimatch');
 const playwright = require('playwright');
@@ -37,30 +38,44 @@ if (argv.help) {
 }
 
 const withReporter = (function () {
-	const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', argv.reporter);
-	let ctor;
-
-	try {
-		ctor = require(reporterPath);
-	} catch (err) {
-		try {
-			ctor = require(argv.reporter);
-		} catch (err) {
-			ctor = process.platform === 'win32' ? mocha.reporters.List : mocha.reporters.Spec;
-			console.warn(`could not load reporter: ${argv.reporter}, using ${ctor.name}`);
+	if (argv.tfs) {
+		{
+			return (browserType, runner) => {
+				new mocha.reporters.Spec(runner);
+				new MochaJUnitReporter(runner, {
+					reporterOptions: {
+						testsuitesTitle: `${argv.tfs} ${process.platform}`,
+						mochaFile: process.env.BUILD_ARTIFACTSTAGINGDIRECTORY ? path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${browserType}-${argv.tfs.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`) : undefined
+					}
+				});
+			}
 		}
+	} else {
+		const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', argv.reporter);
+		let ctor;
+
+		try {
+			ctor = require(reporterPath);
+		} catch (err) {
+			try {
+				ctor = require(argv.reporter);
+			} catch (err) {
+				ctor = process.platform === 'win32' ? mocha.reporters.List : mocha.reporters.Spec;
+				console.warn(`could not load reporter: ${argv.reporter}, using ${ctor.name}`);
+			}
+		}
+
+		function parseReporterOption(value) {
+			let r = /^([^=]+)=(.*)$/.exec(value);
+			return r ? { [r[1]]: r[2] } : {};
+		}
+
+		let reporterOptions = argv['reporter-options'];
+		reporterOptions = typeof reporterOptions === 'string' ? [reporterOptions] : reporterOptions;
+		reporterOptions = reporterOptions.reduce((r, o) => Object.assign(r, parseReporterOption(o)), {});
+
+		return (_, runner) => new ctor(runner, { reporterOptions })
 	}
-
-	function parseReporterOption(value) {
-		let r = /^([^=]+)=(.*)$/.exec(value);
-		return r ? { [r[1]]: r[2] } : {};
-	}
-
-	let reporterOptions = argv['reporter-options'];
-	reporterOptions = typeof reporterOptions === 'string' ? [reporterOptions] : reporterOptions;
-	reporterOptions = reporterOptions.reduce((r, o) => Object.assign(r, parseReporterOption(o)), {});
-
-	return (runner) => new ctor(runner, { reporterOptions })
 })()
 
 const outdir = argv.build ? 'out-build' : 'out';
@@ -137,7 +152,7 @@ async function runTestsInBrowser(testModules, browserType) {
 		console[msg.type()](msg.text(), await Promise.all(msg.args().map(async arg => await arg.jsonValue())));
 	});
 
-	withReporter(new EchoRunner(emitter, browserType.toUpperCase()));
+	withReporter(browserType, new EchoRunner(emitter, browserType.toUpperCase()));
 
 	// collection failures for console printing
 	const fails = [];

test/unit/electron/index.js

@@ -9,9 +9,13 @@ const { join } = require('path');
 const path = require('path');
 const mocha = require('mocha');
 const events = require('events');
-// const MochaJUnitReporter = require('mocha-junit-reporter');
+const MochaJUnitReporter = require('mocha-junit-reporter');
 const url = require('url');
 
+// Disable render process reuse, we still have
+// non-context aware native modules in the renderer.
+app.allowRendererProcessReuse = false;
+
 const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
 
 const optimist = require('optimist')
@@ -145,13 +149,12 @@ app.on('ready', () => {
 
 	if (argv.tfs) {
 		new mocha.reporters.Spec(runner);
-		// TODO@deepak the mocha Junit reporter seems to cause a hang when running with Electron 6 inside docker container
-		// new MochaJUnitReporter(runner, {
-		// 	reporterOptions: {
-		// 		testsuitesTitle: `${argv.tfs} ${process.platform}`,
-		// 		mochaFile: process.env.BUILD_ARTIFACTSTAGINGDIRECTORY ? path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${argv.tfs.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`) : undefined
-		// 	}
-		// });
+		new MochaJUnitReporter(runner, {
+			reporterOptions: {
+				testsuitesTitle: `${argv.tfs} ${process.platform}`,
+				mochaFile: process.env.BUILD_ARTIFACTSTAGINGDIRECTORY ? path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${argv.tfs.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`) : undefined
+			}
+		});
 	} else {
 		const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', argv.reporter);
 		let Reporter;