From 8ba65b550f21adac9b3de9f595907baf0f213fdb Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 24 Nov 2020 06:09:45 -0800
Subject: [PATCH] test: fix flaky sequential/test-fs-watch

Fixes: https://github.com/nodejs/node/issues/36247

PR-URL: https://github.com/nodejs/node/pull/36249
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/sequential/test-fs-watch.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/test/sequential/test-fs-watch.js b/test/sequential/test-fs-watch.js
index 8c543a2a17290a..c5db585f3f4a59 100644
--- a/test/sequential/test-fs-watch.js
+++ b/test/sequential/test-fs-watch.js
@@ -42,6 +42,15 @@ const testDir = tmpdir.path;
 
 tmpdir.refresh();
 
+// Because macOS (and possibly other operating systems) can return a watcher
+// before it is actually watching, we need to repeat the operation to avoid
+// a race condition.
+function repeat(fn) {
+  setImmediate(fn);
+  const interval = setInterval(fn, 5000);
+  return interval;
+}
+
 {
   const filepath = path.join(testDir, 'watch.txt');
 
@@ -54,12 +63,11 @@ tmpdir.refresh();
     if (expectFilePath) {
       assert.strictEqual(filename, 'watch.txt');
     }
+    clearInterval(interval);
     watcher.close();
   }));
 
-  setImmediate(function() {
-    fs.writeFileSync(filepath, 'world');
-  });
+  const interval = repeat(() => { fs.writeFileSync(filepath, 'world'); });
 }
 
 {
@@ -76,12 +84,11 @@ tmpdir.refresh();
       if (expectFilePath) {
         assert.strictEqual(filename, 'hasOwnProperty');
       }
+      clearInterval(interval);
       watcher.close();
     }));
 
-  setImmediate(function() {
-    fs.writeFileSync(filepathAbs, 'pardner');
-  });
+  const interval = repeat(() => { fs.writeFileSync(filepathAbs, 'pardner'); });
 }
 
 {
@@ -97,14 +104,15 @@ tmpdir.refresh();
       } else {
         assert.strictEqual(filename, null);
       }
+      clearInterval(interval);
       watcher.close();
     }));
 
-  setImmediate(function() {
+  const interval = repeat(() => {
+    fs.rmSync(filepath, { force: true });
     const fd = fs.openSync(filepath, 'w');
     fs.closeSync(fd);
   });
-
 }
 
 // https://github.com/joyent/node/issues/2293 - non-persistent watcher should