Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e (#5028)

test/smoke/README.md

@@ -14,7 +14,7 @@ cd ../..
 yarn smoketest
 
 # Build
-yarn smoketest --build PATH_TO_BUILD --stable-build PATH_TO_STABLE_BUILD
+yarn smoketest --build PATH_TO_NEW_BUILD_PARENT_FOLDER --stable-build PATH_TO_LAST_STABLE_BUILD_PARENT_FOLDER
 ```
 
 ### Run for a release
@@ -24,7 +24,14 @@ You must always run the smoketest version which matches the release you are test
 ```bash
 git checkout release/1.22
 yarn
-yarn smoketest --build PATH_TO_RELEASE_BUILD --stable-build PATH_TO_STABLE_BUILD
+```
+
+In addition to the new build to be released you will need the previous stable build so that the smoketest can test the data migration. 
+The recommended way to make these builds available for the smoketest is by downloading their archive version (\*.zip) and extracting 
+them into two folders. Pass the folder paths to the smoketest as follows:
+
+```bash
+yarn smoketest --build PATH_TO_NEW_RELEASE_PARENT_FOLDER --stable-build PATH_TO_LAST_STABLE_RELEASE_PARENT_FOLDER
 ```
 
 ### Debug

test/smoke/src/application.ts

@@ -127,6 +127,7 @@ export class Application {
 			verbose: this.options.verbose,
 			log: this.options.log,
 			extraArgs,
+			remote: this.options.remote
 		});
 
 		this._workbench = new Workbench(this._code, this.userDataPath);

test/smoke/src/main.ts

@@ -56,7 +56,8 @@ const opts = minimist(args, {
 		'log'
 	],
 	boolean: [
-		'verbose'
+		'verbose',
+		'remote'
 	],
 	default: {
 		verbose: false
@@ -210,7 +211,8 @@ function createOptions(): ApplicationOptions {
 		logger: new MultiLogger(loggers),
 		verbose: opts.verbose,
 		log,
-		screenshotsPath
+		screenshotsPath,
+		remote: opts.remote
 	};
 }
 

test/smoke/src/vscode/code.ts

@@ -90,6 +90,7 @@ export interface SpawnOptions {
 	verbose?: boolean;
 	extraArgs?: string[];
 	log?: string;
+	remote?: boolean;
 }
 
 async function createDriverHandle(): Promise<string> {
@@ -120,6 +121,15 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 		'--driver', handle
 	];
 
+	if (options.remote) {
+		// Replace workspace path with URI
+		args.shift();
+		args.push(
+			`--${options.workspacePath.endsWith('.code-workspace') ? 'file' : 'folder'}-uri`,
+			`vscode-remote://test+test${options.workspacePath}`,
+		);
+	}
+
 	if (!codePath) {
 		args.unshift(repoPath);
 	}