Fix tests (#90)

Author: Paul Wang

src/vs/workbench/services/environment/browser/environmentService.ts

@@ -306,8 +306,8 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 			extensionDevelopmentKind: undefined
 		};
 
-		// Extension host development options from the payload are only valid in development builds.
-		if (this.payload && !this.isBuilt) {
+		// Extension host development options from the payload are only valid in development or smoke test builds.
+		if (this.payload && (!this.isBuilt || this.enableSmokeTestDriver)) {
 			for (const [key, value] of this.payload) {
 				switch (key) {
 					case 'extensionDevelopmentPath':

src/vs/workbench/services/environment/test/browser/environmentService.test.ts

@@ -100,4 +100,39 @@ suite('BrowserWorkbenchEnvironmentService', () => {
 			extensionEnabledProposedApi: []
 		});
 	});
+
+	test('accepts extension host options from payload in production smoke tests', () => {
+		const environmentService = new BrowserWorkbenchEnvironmentService('', URI.file('/logs'), {
+			developmentOptions: { enableSmokeTestDriver: true, logLevel: LogLevel.Info },
+			workspaceProvider: {
+				workspace: undefined,
+				trusted: true,
+				payload: privilegedPayload,
+				open: async () => true
+			}
+		}, { ...TestProductService, commit: 'built' });
+
+		assert.deepStrictEqual({
+			debugExtensionHost: environmentService.debugExtensionHost,
+			debugRenderer: environmentService.debugRenderer,
+			isExtensionDevelopment: environmentService.isExtensionDevelopment,
+			extensionDevelopmentLocationURI: environmentService.extensionDevelopmentLocationURI,
+			extensionDevelopmentLocationKind: environmentService.extensionDevelopmentLocationKind,
+			extensionTestsLocationURI: environmentService.extensionTestsLocationURI,
+			extensionEnabledProposedApi: environmentService.extensionEnabledProposedApi
+		}, {
+			debugExtensionHost: {
+				port: 1234,
+				break: true,
+				debugId: 'debug-id',
+				env: { NODE_OPTIONS: '--import=data:text/javascript,' }
+			},
+			debugRenderer: true,
+			isExtensionDevelopment: true,
+			extensionDevelopmentLocationURI: [URI.parse('file:///extension')],
+			extensionDevelopmentLocationKind: ['workspace'],
+			extensionTestsLocationURI: URI.parse('file:///extension/test.js'),
+			extensionEnabledProposedApi: []
+		});
+	});
 });

test/integration/browser/src/index.ts

@@ -191,7 +191,7 @@ async function launchServer(browserType: BrowserType, browserChannel: BrowserCha
 		...process.env
 	};
 
-	const serverArgs = ['--enable-proposed-api', '--disable-telemetry', '--disable-experiments', '--server-data-dir', userDataDir, '--accept-server-license-terms', '--disable-workspace-trust'];
+	const serverArgs = ['--enable-proposed-api', '--disable-telemetry', '--disable-experiments', '--server-data-dir', userDataDir, '--accept-server-license-terms', '--disable-workspace-trust', '--enable-smoke-test-driver'];
 
 	let serverLocation: string;
 	if (process.env.VSCODE_REMOTE_SERVER_PATH) {