watcher - harden test for unexpected events

benoitf · Nov 11, 2021 · 84c9bf4 · 84c9bf4
1 parent 9efa55c
commit 84c9bf4
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/vs/platform/files/test/node/recursiveWatcher.integrationTest.ts b/src/vs/platform/files/test/node/recursiveWatcher.integrationTest.ts
@@ -212,14 +212,27 @@ flakySuite('Recursive Watcher (parcel)', () => {
 		await Promises.writeFile(copiedFilepath, 'Hello Change');
 		await changeFuture;
 
+		// Create new file
+		const anotherNewFilePath = join(testDir, 'deep', 'anotherNewFile.txt');
+		changeFuture = awaitEvent(service, anotherNewFilePath, FileChangeType.ADDED);
+		await Promises.writeFile(anotherNewFilePath, 'Hello Another World');
+		await changeFuture;
+
+		await timeout(1500); // ensure the previous added event is flushed by now (can happen on macOS with fsevents)
+
 		// Read file does not emit event
-		changeFuture = awaitEvent(service, copiedFilepath, FileChangeType.UPDATED, 'unexpected-event-from-read-file');
-		await Promises.readFile(copiedFilepath);
+		changeFuture = awaitEvent(service, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-read-file');
+		await Promises.readFile(anotherNewFilePath);
 		await Promise.race([timeout(100), changeFuture]);
 
 		// Stat file does not emit event
-		changeFuture = awaitEvent(service, copiedFilepath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
-		await Promises.stat(copiedFilepath);
+		changeFuture = awaitEvent(service, anotherNewFilePath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
+		await Promises.stat(anotherNewFilePath);
+		await Promise.race([timeout(100), changeFuture]);
+
+		// Stat folder does not emit event
+		changeFuture = awaitEvent(service, copiedFolderpath, FileChangeType.UPDATED, 'unexpected-event-from-stat');
+		await Promises.stat(copiedFolderpath);
 		await Promise.race([timeout(100), changeFuture]);
 
 		// Delete file