Switch away from timeouts

src/vs/base/test/common/async.test.ts

@@ -1522,7 +1522,15 @@ suite('Async', () => {
 
 		test('waitThrottleDelayBetweenWorkUnits option', async () => {
 			const handled: number[] = [];
-			const handler = (units: readonly number[]) => handled.push(...units);
+			let handledCallback: Function;
+			let handledPromise = new Promise(resolve => handledCallback = resolve);
+			let currentTime = 0;
+
+			const handler = (units: readonly number[]) => {
+				handled.push(...units);
+				handledCallback();
+				handledPromise = new Promise(resolve => handledCallback = resolve);
+			};
 
 			const worker = store.add(new async.ThrottledWorker<number>({
 				maxWorkChunkSize: 5,
@@ -1531,20 +1539,22 @@ suite('Async', () => {
 				waitThrottleDelayBetweenWorkUnits: true
 			}, handler));
 
+			// Schedule work, it should execute immediately
+			currentTime = Date.now();
 			let worked = worker.work([1, 2, 3]);
 			assert.strictEqual(worked, true);
 			assertArrayEquals(handled, [1, 2, 3]);
+			assert.strictEqual(Date.now() - currentTime < 5, true);
 
-			await async.timeout(2);
-
-			// Add more work immediately, should not be processed due to the `waitThrottleDelayBetweenWorkUnits`. We only waited 2 of the 5ms.
-			worked = worker.work([4, 5, 6]);
+			// Schedule work again, it should wait at least throttle delay before executing
+			currentTime = Date.now();
+			worked = worker.work([4, 5]);
 			assert.strictEqual(worked, true);
+			// Throttle delay hasn't reset so we still must wait
 			assertArrayEquals(handled, [1, 2, 3]);
-
-			// Wait an additional 5 ms and check that the work has now been processed
-			await async.timeout(5);
-			assertArrayEquals(handled, [1, 2, 3, 4, 5, 6]);
+			await handledPromise;
+			assert.strictEqual(Date.now() - currentTime >= 5, true);
+			assertArrayEquals(handled, [1, 2, 3, 4, 5]);
 		});
 	});