Merge branch 'master' into joh/browser-tests

jrieken · jrieken · commit a2d76d6133b4 · 2020-02-05T09:28:45.000+01:00
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
@@ -3,7 +3,7 @@ setlocal
 
 pushd %~dp0\..
 
-set VSCODEUSERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
+set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
 
 :: Figure out which Electron to use for running tests
 if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
@@ -50,10 +50,10 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 call "%INTEGRATION_TEST_ELECTRON_PATH%" $%~dp0\..\extensions\emmet\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR% .
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-REM set GITWORKSPACE=%TMP%\git-%RANDOM%
-REM mkdir %GITWORKSPACE%
-REM call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
-REM if %errorlevel% neq 0 exit /b %errorlevel%
+set GITWORKSPACE=%TEMP%\git-%RANDOM%
+mkdir %GITWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 :: Tests in commonJS (HTML, CSS, JSON language server tests...)
 call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\*\server\out\test\**\*.test.js
diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
@@ -51,10 +51,10 @@ export class DeferredPromise<T> {
 
 export function toResource(this: any, path: string) {
 	if (isWindows) {
-		return URI.file(join('C:\\', Buffer.from(this.test.fullTitle()).toString('base64'), path));
+		return URI.file(join('C:\\', btoa(this.test.fullTitle()), path));
 	}
 
-	return URI.file(join('/', Buffer.from(this.test.fullTitle()).toString('base64'), path));
+	return URI.file(join('/', btoa(this.test.fullTitle()), path));
 }
 
 export function suiteRepeat(n: number, description: string, callback: (this: any) => void): void {

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ export class DeferredPromise<T> {`
`51`	`51`
`52`	`52`	`export function toResource(this: any, path: string) {`
`53`	`53`	`if (isWindows) {`
`54`		`- return URI.file(join('C:\\', Buffer.from(this.test.fullTitle()).toString('base64'), path));`
	`54`	`+ return URI.file(join('C:\\', btoa(this.test.fullTitle()), path));`
`55`	`55`	`}`
`56`	`56`
`57`		`- return URI.file(join('/', Buffer.from(this.test.fullTitle()).toString('base64'), path));`
	`57`	`+ return URI.file(join('/', btoa(this.test.fullTitle()), path));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`export function suiteRepeat(n: number, description: string, callback: (this: any) => void): void {`