From a08b59f2a6bac0cc9207e9ea980481ea704a11fd Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 8 Jun 2017 12:25:31 -0700 Subject: [PATCH] test: refactor async-hooks test-callback-error Two child processes have their logic in a switch statement and a third uses an `if` statement to detect it. Move all three child process tasks into switch statement. PR-URL: https://github.com/nodejs/node/pull/13554 Reviewed-By: Trevor Norris Reviewed-By: Refael Ackermann Reviewed-By: David Cai Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Yuta Hiroto --- test/async-hooks/test-callback-error.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/async-hooks/test-callback-error.js b/test/async-hooks/test-callback-error.js index 8fe0177449e..6b09e4bb497 100644 --- a/test/async-hooks/test-callback-error.js +++ b/test/async-hooks/test-callback-error.js @@ -24,15 +24,14 @@ switch (process.argv[2]) { async_hooks.triggerId()); async_hooks.emitBefore(async_hooks.currentId()); break; -} + case 'test_callback_abort': + initHooks({ + oninit: common.mustCall(() => { throw new Error('test_callback_abort'); }) + }).enable(); -if (process.execArgv.includes('--abort-on-uncaught-exception')) { - initHooks({ - oninit: common.mustCall(() => { throw new Error('test_callback_abort'); }) - }).enable(); - - async_hooks.emitInit(async_hooks.currentId(), 'test_callback_abort', - async_hooks.triggerId()); + async_hooks.emitInit(async_hooks.currentId(), 'test_callback_abort', + async_hooks.triggerId()); + break; } const c1 = spawnSync(`${process.execPath}`, [__filename, 'test_init_callback']);