From efd776fb137eff6a95f8a6aa6654b0a20b8f97ac Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 2 Sep 2018 15:39:43 +0200 Subject: [PATCH 1/3] test: fix flaky async-hooks/test-callback-error Remove an unnecessary timeout. Fixes: https://github.com/nodejs/node/issues/15985 --- test/async-hooks/test-callback-error.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/async-hooks/test-callback-error.js b/test/async-hooks/test-callback-error.js index 450f34bee1021a..b36aa5939a411b 100644 --- a/test/async-hooks/test-callback-error.js +++ b/test/async-hooks/test-callback-error.js @@ -78,15 +78,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); From 5d66adb872e0b9744b242c3165587a59eca2b9d9 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 2 Sep 2018 15:42:17 +0200 Subject: [PATCH 2/3] Revert "test: mark async-hooks/test-callback-error as flaky" This reverts commit 59c8abf8862dfe0df8d19cee0de9597388e43737. --- test/async-hooks/async-hooks.status | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/async-hooks/async-hooks.status b/test/async-hooks/async-hooks.status index d3010612280638..e540645e544a88 100644 --- a/test/async-hooks/async-hooks.status +++ b/test/async-hooks/async-hooks.status @@ -13,8 +13,6 @@ test-statwatcher: PASS,FLAKY [$system==linux] # https://github.com/nodejs/node/issues/21425 test-statwatcher: PASS,FLAKY -# https://github.com/nodejs/node/issues/15985 -test-callback-error: PASS,FLAKY [$system==macos] From 45d86009b1acb8b07fb7639cf6a60689aaa5ebc1 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 2 Sep 2018 16:07:40 +0200 Subject: [PATCH 3/3] fixup! test: fix flaky async-hooks/test-callback-error --- test/async-hooks/test-callback-error.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/async-hooks/test-callback-error.js b/test/async-hooks/test-callback-error.js index b36aa5939a411b..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