Merge remote-tracking branch 'origin/master' into HEAD

microsoft · Oct 22, 2020 · 1dfc92e · 1dfc92e
2 parents 8af28bb + d0c90c9
commit 1dfc92e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/vs/base/parts/storage/test/node/storage.test.ts b/src/vs/base/parts/storage/test/node/storage.test.ts
@@ -14,7 +14,12 @@ import { timeout } from 'vs/base/common/async';
 import { Event, Emitter } from 'vs/base/common/event';
 import { isWindows } from 'vs/base/common/platform';
 
-suite('Storage Library', () => {
+suite('Storage Library', function () {
+
+	// Given issues such as https://github.com/microsoft/vscode/issues/108113
+	// we see random test failures when accessing the native file system.
+	this.retries(3);
+	this.timeout(1000 * 20);
 
 	function uniqueStorageDir(): string {
 		const id = generateUuid();
@@ -278,7 +283,12 @@ suite('Storage Library', () => {
 	});
 });
 
-suite('SQLite Storage Library', () => {
+suite('SQLite Storage Library', function () {
+
+	// Given issues such as https://github.com/microsoft/vscode/issues/108113
+	// we see random test failures when accessing the native file system.
+	this.retries(3);
+	this.timeout(1000 * 20);
 
 	function uniqueStorageDir(): string {
 		const id = generateUuid();
@@ -540,8 +550,6 @@ suite('SQLite Storage Library', () => {
 	});
 
 	test('real world example', async function () {
-		this.timeout(20000);
-
 		const storageDir = uniqueStorageDir();
 
 		await mkdirp(storageDir);

diff --git a/src/vs/platform/storage/test/node/storageService.test.ts b/src/vs/platform/storage/test/node/storageService.test.ts
@@ -18,11 +18,6 @@ import { URI } from 'vs/base/common/uri';
 
 suite('StorageService', function () {
 
-	// Given issues such as https://github.com/microsoft/vscode/issues/108113
-	// we see random test failures when accessing the native file system.
-	this.retries(3);
-	this.timeout(1000 * 10);
-
 	test('Remove Data (global, in-memory)', () => {
 		removeData(StorageScope.GLOBAL);
 	});
@@ -89,6 +84,12 @@ suite('StorageService', function () {
 	}
 
 	test('Migrate Data', async () => {
+
+		// Given issues such as https://github.com/microsoft/vscode/issues/108113
+		// we see random test failures when accessing the native file system.
+		this.retries(3);
+		this.timeout(1000 * 20);
+
 		class StorageTestEnvironmentService extends NativeEnvironmentService {
 
 			constructor(private workspaceStorageFolderPath: URI, private _extensionsPath: string) {