From e6295eae65ac5d111bff7901ff10af83ab6e43b1 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 12 Jul 2019 21:55:45 +0200
Subject: [PATCH] Remote smoke test fails for 1.36.1. fixes #76987

---
 test/smoke/package.json       | 3 +++
 test/smoke/src/vscode/code.ts | 8 +++-----
 test/smoke/yarn.lock          | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/smoke/package.json b/test/smoke/package.json
index 80f93f04d89..2d92a7a8846 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -35,5 +35,8 @@
     "tmp": "0.0.33",
     "typescript": "2.9.2",
     "watch": "^1.0.2"
+  },
+  "dependencies": {
+    "vscode-uri": "^2.0.3"
   }
 }
diff --git a/test/smoke/src/vscode/code.ts b/test/smoke/src/vscode/code.ts
index 0b9c739cb69..9f468fddd8b 100644
--- a/test/smoke/src/vscode/code.ts
+++ b/test/smoke/src/vscode/code.ts
@@ -12,6 +12,7 @@ import { tmpName } from 'tmp';
 import { IDriver, connect as connectDriver, IDisposable, IElement, Thenable } from './driver';
 import { Logger } from '../logger';
 import { ncp } from 'ncp';
+import { URI } from 'vscode-uri';
 
 const repoPath = path.join(__dirname, '../../../..');
 
@@ -128,11 +129,8 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 
 	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}`,
-		);
+		args[0] = `--${options.workspacePath.endsWith('.code-workspace') ? 'file' : 'folder'}-uri=vscode-remote://test+test/${URI.file(options.workspacePath).path}`;
+
 		if (codePath) {
 			// running against a build: copy the test resolver extension
 			const testResolverExtPath = path.join(options.extensionsPath, 'vscode-test-resolver');
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
index ca28dd6bf19..4af77efee7c 100644
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -2623,6 +2623,11 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+vscode-uri@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.3.tgz#25e5f37f552fbee3cec7e5f80cef8469cefc6543"
+  integrity sha512-4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==
+
 watch@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c"
-- 
GitLab