process: fix promise catching

Fixes: #30953 PR-URL: #30957 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Dec 16, 2019 · 81e3bca · 81e3bca
1 parent 437b6d5
commit 81e3bca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/internal/process/promises.js b/lib/internal/process/promises.js
@@ -125,7 +125,8 @@ function handledRejection(promise) {
       return;
     }
   }
-  setHasRejectionToWarn(false);
+  if (maybeUnhandledPromises.size === 0 && asyncHandledRejections.length === 0)
+    setHasRejectionToWarn(false);
 }
 
 const unhandledRejectionErrName = 'UnhandledPromiseRejectionWarning';

diff --git a/test/parallel/test-promises-unhandled-rejections.js b/test/parallel/test-promises-unhandled-rejections.js
@@ -718,3 +718,15 @@ asyncTest(
     let timer = setTimeout(common.mustNotCall(), 10000);
   },
 );
+
+// https://github.com/nodejs/node/issues/30953
+asyncTest(
+  'Catching a promise should not take effect on previous promises',
+  function(done) {
+    onUnhandledSucceed(done, function(reason, promise) {
+      assert.strictEqual(reason, '1');
+    });
+    Promise.reject('1');
+    Promise.reject('2').catch(function() {});
+  }
+);