Merge branch 'nodejs:main' into main

Author: Javonne-liu

lib/internal/fs/recursive_watch.js

@@ -157,7 +157,9 @@ class FSWatcher extends EventEmitter {
         }
       }
     } catch (error) {
-      this.emit('error', error);
+      if (error.code !== 'ENOENT') {
+        this.emit('error', error);
+      }
     }
   }
 

test/async-hooks/test-emit-after-on-destroyed.js

@@ -55,7 +55,7 @@ if (process.argv[2] === 'child') {
   child.on('close', common.mustCall((code, signal) => {
     if ((common.isAIX ||
          (common.isLinux && process.arch === 'x64')) &&
-         signal === 'SIGABRT') {
+        common.nodeProcessAborted(code, signal)) {
       // XXX: The child process could be aborted due to unknown reasons. Work around it.
     } else {
       assert.strictEqual(signal, null);

test/async-hooks/test-improper-order.js

@@ -53,8 +53,8 @@ if (process.argv[2] === 'child') {
 
   child.on('close', common.mustCall((code, signal) => {
     if ((common.isAIX ||
-        (common.isLinux && process.arch === 'x64')) &&
-        signal === 'SIGABRT') {
+         (common.isLinux && process.arch === 'x64')) &&
+        common.nodeProcessAborted(code, signal)) {
       // XXX: The child process could be aborted due to unknown reasons. Work around it.
     } else {
       assert.strictEqual(signal, null);

test/async-hooks/test-improper-unwind.js

@@ -58,7 +58,7 @@ if (process.argv[2] === 'child') {
   child.on('close', common.mustCall((code, signal) => {
     if ((common.isAIX ||
          (common.isLinux && process.arch === 'x64')) &&
-         signal === 'SIGABRT') {
+        common.nodeProcessAborted(code, signal)) {
       // XXX: The child process could be aborted due to unknown reasons. Work around it.
     } else {
       assert.strictEqual(signal, null);

test/parallel/test-fs-watch-recursive-delete-race.js

@@ -0,0 +1,44 @@
+// Flags: --expose-internals
+'use strict';
+
+const common = require('../common');
+const tmpdir = require('../common/tmpdir');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const { kFSWatchStart } = require('internal/fs/watchers');
+const { FSWatcher } = require('internal/fs/recursive_watch');
+
+if (common.isIBMi)
+  common.skip('IBMi does not support `fs.watch()`');
+
+tmpdir.refresh();
+
+const parent = tmpdir.resolve('parent');
+const child = path.join(parent, 'child');
+fs.mkdirSync(child, { recursive: true });
+fs.writeFileSync(path.join(child, 'test.tmp'), 'test');
+
+const watch = fs.watch;
+let deletedChild = false;
+fs.watch = function(filename, ...args) {
+  const watcher = Reflect.apply(watch, this, [filename, ...args]);
+
+  if (filename === child) {
+    fs.rmSync(child, { recursive: true });
+    deletedChild = true;
+  }
+
+  return watcher;
+};
+
+const watcher = new FSWatcher({ recursive: true });
+watcher.on('error', common.mustNotCall());
+
+try {
+  watcher[kFSWatchStart](parent);
+  assert.strictEqual(deletedChild, true);
+} finally {
+  watcher.close();
+  fs.watch = watch;
+}