💄 editor tests

Benjamin Pasero · Benjamin Pasero · commit 65985c1ee9be · 2020-01-09T12:30:48.000+01:00
diff --git a/src/vs/workbench/contrib/files/test/browser/fileEditorTracker.test.ts b/src/vs/workbench/contrib/files/test/browser/fileEditorTracker.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { Event } from 'vs/base/common/event';
 import { FileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/fileEditorTracker';
 import { toResource } from 'vs/base/test/common/utils';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -106,7 +107,7 @@ suite('Files - FileEditorTracker', () => {
 
 		model.textEditorModel.setValue('Super Good');
 
-		await timeout(300 /* 250ms debounce delay in text file editor model manager */);
+		await awaitEditorOpening(editorService);
 		assert.ok(editorService.isOpen({ resource }));
 
 		part.dispose();
@@ -138,11 +139,17 @@ suite('Files - FileEditorTracker', () => {
 
 		model.textEditorModel.setValue('Super Good');
 
-		await timeout(300 /* 250ms debounce delay in tracker */);
+		await awaitEditorOpening(editorService);
 		assert.ok(editorService.isOpen(untitledEditor));
 
 		part.dispose();
 		tracker.dispose();
 		model.dispose();
 	});
+
+	function awaitEditorOpening(editorService: IEditorService): Promise<void> {
+		return new Promise(c => {
+			Event.once(editorService.onDidActiveEditorChange)(c);
+		});
+	}
 });
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
@@ -1094,7 +1094,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 	test('no change event when there are no global tasks', async () => {
 		const target = sinon.spy();
 		testObject.onDidChangeConfiguration(target);
-		await timeout(500);
+		await timeout(5);
 		assert.ok(target.notCalled);
 	});
 
