From 4791cd7f0a17904017c19846acbd0caf74a97b0a Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Sun, 2 Sep 2018 15:39:43 +0200
Subject: [PATCH] test: fix flaky async-hooks/test-callback-error

Remove an unnecessary timeout.

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

PR-URL: https://github.com/nodejs/node/pull/22655
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: George Adams <george.adams@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
---
 test/async-hooks/test-callback-error.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/test/async-hooks/test-callback-error.js b/test/async-hooks/test-callback-error.js
index 450f34bee1021a..07ed274342fd06 100644
--- a/test/async-hooks/test-callback-error.js
+++ b/test/async-hooks/test-callback-error.js
@@ -58,10 +58,6 @@ assert.ok(!arg);
 {
   console.log('start case 3');
   console.time('end case 3');
-  // Timeout is set because this case is known to be problematic, so stderr is
-  // logged for further analysis.
-  // Ref: https://github.com/nodejs/node/issues/13527
-  // Ref: https://github.com/nodejs/node/pull/13559
   const opts = {
     execArgv: ['--abort-on-uncaught-exception'],
     silent: true
@@ -78,15 +74,7 @@ assert.ok(!arg);
     stderr += data;
   });
 
-  const tO = setTimeout(() => {
-    console.log(stderr);
-    child.kill('SIGKILL');
-    process.exit(1);
-  }, 15 * 1000);
-  tO.unref();
-
   child.on('close', (code, signal) => {
-    clearTimeout(tO);
     if (common.isWindows) {
       assert.strictEqual(code, 134);
       assert.strictEqual(signal, null);