From d813315714aad6390f59cc6a10458d19267d4001 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Mon, 24 Jun 2019 10:49:34 +0200
Subject: [PATCH] comment out more (for #74898)

---
 .../src/singlefolder-tests/workspace.test.ts         | 12 ++++++------
 scripts/test-integration.bat                         | 10 +++++-----
 scripts/test-integration.sh                          |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
index 67059e58c50..dc700abdf1b 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -513,28 +513,28 @@ suite('workspace-namespace', () => {
 		});
 	});
 
-	(process.platform === 'win32' ? test.skip /* https://github.com/microsoft/vscode/issues/74898 */ : test)('findFiles', () => {
+	test('findFiles', () => {
 		return vscode.workspace.findFiles('**/*.png').then((res) => {
 			assert.equal(res.length, 2);
 			assert.equal(basename(vscode.workspace.asRelativePath(res[0])), 'image.png');
 		});
 	});
 
-	(process.platform === 'win32' ? test.skip /* https://github.com/microsoft/vscode/issues/74898 */ : test)('findFiles - exclude', () => {
+	test('findFiles - exclude', () => {
 		return vscode.workspace.findFiles('**/*.png').then((res) => {
 			assert.equal(res.length, 2);
 			assert.equal(basename(vscode.workspace.asRelativePath(res[0])), 'image.png');
 		});
 	});
 
-	(process.platform === 'win32' ? test.skip /* https://github.com/microsoft/vscode/issues/74898 */ : test)('findFiles, exclude', () => {
+	test('findFiles, exclude', () => {
 		return vscode.workspace.findFiles('**/*.png', '**/sub/**').then((res) => {
 			assert.equal(res.length, 1);
 			assert.equal(basename(vscode.workspace.asRelativePath(res[0])), 'image.png');
 		});
 	});
 
-	(process.platform === 'win32' ? test.skip /* https://github.com/microsoft/vscode/issues/74898 */ : test)('findFiles, cancellation', () => {
+	test('findFiles, cancellation', () => {
 
 		const source = new vscode.CancellationTokenSource();
 		const token = source.token; // just to get an instance first
@@ -545,7 +545,7 @@ suite('workspace-namespace', () => {
 		});
 	});
 
-	(process.platform === 'win32' ? test.skip /* https://github.com/microsoft/vscode/issues/74898 */ : test)('findTextInFiles', async () => {
+	test('findTextInFiles', async () => {
 		const options: vscode.FindTextInFilesOptions = {
 			include: '*.ts',
 			previewOptions: {
@@ -565,7 +565,7 @@ suite('workspace-namespace', () => {
 		assert.equal(vscode.workspace.asRelativePath(match.uri), '10linefile.ts');
 	});
 
-	(process.platform === 'win32' ? suite.skip /* https://github.com/microsoft/vscode/issues/74898 */ : suite)('findTextInFiles, cancellation', async () => {
+	test('findTextInFiles, cancellation', async () => {
 		const results: vscode.TextSearchResult[] = [];
 		const cancellation = new vscode.CancellationTokenSource();
 		cancellation.cancel();
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index cf8902a2bce..4f38bc04c5a 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -23,12 +23,12 @@ call .\scripts\code.bat $%~dp0\..\extensions\emmet\test-fixtures --extensionDeve
 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
-if %errorlevel% neq 0 exit /b %errorlevel%
+REM call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\*\server\out\test\**\*.test.js
+REM if %errorlevel% neq 0 exit /b %errorlevel%
 
-if exist ".\resources\server\test\test-remote-integration.bat" (
-	call .\resources\server\test\test-remote-integration.bat
-)
+REM if exist ".\resources\server\test\test-remote-integration.bat" (
+REM 	call .\resources\server\test\test-remote-integration.bat
+REM )
 
 rmdir /s /q %VSCODEUSERDATADIR%
 
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index a9058442dce..3d397ed204e 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -21,9 +21,9 @@ cd $ROOT
 ./scripts/code.sh $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disable-extensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
 ./scripts/code.sh $ROOT/extensions/markdown-language-features/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disable-extensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
 
-# mkdir -p $ROOT/extensions/emmet/test-fixtures
-# ./scripts/code.sh $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-extensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
-# rm -rf $ROOT/extensions/emmet/test-fixtures
+mkdir -p $ROOT/extensions/emmet/test-fixtures
+./scripts/code.sh $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-extensions --user-data-dir=$VSCODEUSERDATADIR --skip-getting-started
+rm -rf $ROOT/extensions/emmet/test-fixtures
 
 if [ -f ./resources/server/test/test-remote-integration.sh ]; then
 	./resources/server/test/test-remote-integration.sh
-- 
GitLab