Fixes #970

petkaantonov · Jan 23, 2016 · c66c2ca · c66c2ca
1 parent 612ad75
commit c66c2ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/timers.js b/src/timers.js
@@ -1,5 +1,5 @@
 "use strict";
-module.exports = function(Promise, INTERNAL) {
+module.exports = function(Promise, INTERNAL, debug) {
 var util = require("./util");
 var TimeoutError = Promise.TimeoutError;
 
@@ -19,7 +19,9 @@ var afterTimeout = function (promise, message, parent) {
     util.markAsOriginatingFromRejection(err);
     promise._attachExtraTrace(err);
     promise._reject(err);
-    parent.cancel();
+    if (debug.cancellation()) {
+        parent.cancel();
+    }
 };
 
 var afterValue = function(value) { return delay(+this).thenReturn(value); };

diff --git a/tools/test.js b/tools/test.js
@@ -101,7 +101,7 @@ function writeCoverageFile(coverage, groupNumber) {
 }
 
 function needsFreshProcess(testName) {
-    return /domain|multiple-copies|unhandled_rejections/.test(testName) ||
+    return /domain|multiple-copies|unhandled_rejections|nodeify/.test(testName) ||
             testUtils.isOldNode && /api_exceptions|promisify/.test(testName);
 }