summaryrefslogtreecommitdiff
path: root/test/async-hooks
diff options
context:
space:
mode:
authorSimon Bruce <simon@blacksun.cx>2018-11-17 15:58:39 +1030
committerRich Trott <rtrott@gmail.com>2018-11-18 23:31:35 -0800
commit738e076556f68bf9bca36f447d8a7cc64769b48e (patch)
tree477db2f0421e0c1100f314c5438e1c3987b541f1 /test/async-hooks
parent97309030effe5d01f1f99197b1f581f4e4d36091 (diff)
downloadandroid-node-v8-738e076556f68bf9bca36f447d8a7cc64769b48e.tar.gz
android-node-v8-738e076556f68bf9bca36f447d8a7cc64769b48e.tar.bz2
android-node-v8-738e076556f68bf9bca36f447d8a7cc64769b48e.zip
test: remove unused function arguments in async-hooks tests
Remove unused function arguments in three async-hooks tests and improve test consistancy. PR-URL: https://github.com/nodejs/node/pull/24406 Reviewed-By: Weijia Wang <starkwang@126.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test/async-hooks')
-rw-r--r--test/async-hooks/test-promise.chain-promise-before-init-hooks.js4
-rw-r--r--test/async-hooks/test-promise.js22
-rw-r--r--test/async-hooks/test-promise.promise-before-init-hooks.js4
3 files changed, 14 insertions, 16 deletions
diff --git a/test/async-hooks/test-promise.chain-promise-before-init-hooks.js b/test/async-hooks/test-promise.chain-promise-before-init-hooks.js
index 9046bc3514..341b7b4c5d 100644
--- a/test/async-hooks/test-promise.chain-promise-before-init-hooks.js
+++ b/test/async-hooks/test-promise.chain-promise-before-init-hooks.js
@@ -8,11 +8,11 @@ const { checkInvocations } = require('./hook-checks');
if (!common.isMainThread)
common.skip('Worker bootstrapping works differently -> different async IDs');
-const p = new Promise(common.mustCall(function executor(resolve, reject) {
+const p = new Promise(common.mustCall(function executor(resolve) {
resolve(5);
}));
-p.then(function afterresolution(val) {
+p.then(function afterResolution(val) {
assert.strictEqual(val, 5);
return val;
});
diff --git a/test/async-hooks/test-promise.js b/test/async-hooks/test-promise.js
index 729704b792..417cb3c80d 100644
--- a/test/async-hooks/test-promise.js
+++ b/test/async-hooks/test-promise.js
@@ -13,24 +13,22 @@ const hooks = initHooks();
hooks.enable();
-const p = (new Promise(common.mustCall(executor)));
-p.then(afterresolution);
-
-function executor(resolve, reject) {
- const as = hooks.activitiesOfTypes('PROMISE');
- assert.strictEqual(as.length, 1);
- const a = as[0];
- checkInvocations(a, { init: 1 }, 'while in promise executor');
- resolve(5);
-}
-
-function afterresolution(val) {
+const p = new Promise(common.mustCall(executor));
+p.then(function afterResolution(val) {
assert.strictEqual(val, 5);
const as = hooks.activitiesOfTypes('PROMISE');
assert.strictEqual(as.length, 2);
checkInvocations(as[0], { init: 1 }, 'after resolution parent promise');
checkInvocations(as[1], { init: 1, before: 1 },
'after resolution child promise');
+});
+
+function executor(resolve) {
+ const as = hooks.activitiesOfTypes('PROMISE');
+ assert.strictEqual(as.length, 1);
+ const a = as[0];
+ checkInvocations(a, { init: 1 }, 'while in promise executor');
+ resolve(5);
}
process.on('exit', onexit);
diff --git a/test/async-hooks/test-promise.promise-before-init-hooks.js b/test/async-hooks/test-promise.promise-before-init-hooks.js
index 957d1a75e4..f9ba24c044 100644
--- a/test/async-hooks/test-promise.promise-before-init-hooks.js
+++ b/test/async-hooks/test-promise.promise-before-init-hooks.js
@@ -5,7 +5,7 @@ const assert = require('assert');
const initHooks = require('./init-hooks');
const { checkInvocations } = require('./hook-checks');
-const p = new Promise(common.mustCall(function executor(resolve, reject) {
+const p = new Promise(common.mustCall(function executor(resolve) {
resolve(5);
}));
@@ -13,7 +13,7 @@ const p = new Promise(common.mustCall(function executor(resolve, reject) {
const hooks = initHooks({ allowNoInit: true });
hooks.enable();
-p.then(function afterresolution(val) {
+p.then(function afterResolution(val) {
assert.strictEqual(val, 5);
const as = hooks.activitiesOfTypes('PROMISE');
assert.strictEqual(as.length, 1);