Skip to content

async_hooks,test: add test for async hooks parity for async/await #20626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MayaLekova wants to merge 4 commits into from
Closed

async_hooks,test: add test for async hooks parity for async/await #20626

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64a2c4b
async_hooks,test: add test for async hooks parity for async/await
MayaLekova May 9, 2018
35b8fcf
async_hooks,test: enhance initHooks with promiseResolve hook
MayaLekova May 11, 2018
dc98e80
async_hooks,test: refactor async/await test to use initHooks
MayaLekova May 11, 2018
d70af92
async_hooks,test: remove unused param from async/await test
MayaLekova May 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
async_hooks,test: enhance initHooks with promiseResolve hook 
Add ability to initHooks and to checkInvocations utilities to transmit
promiseResolve hook as well.

Refs: #20516
  • Loading branch information
@MayaLekova
MayaLekova committed May 11, 2018
commit 35b8fcf568162dfb8e5a393c0d8f10d0c4c70c80
2 changes: 1 addition & 1 deletion test/async-hooks/hook-checks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exports.checkInvocations = function checkInvocations(activity, hooks, stage) {
);

// Check that actual invocations for all hooks match the expected invocations
[ 'init', 'before', 'after', 'destroy' ].forEach(checkHook);
[ 'init', 'before', 'after', 'destroy', 'promiseResolve' ].forEach(checkHook);

function checkHook(k) {
const val = hooks[k];
Expand Down
15 changes: 14 additions & 1 deletion test/async-hooks/init-hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class ActivityCollector {
onbefore,
onafter,
ondestroy,
onpromiseResolve,
logid = null,
logtype = null
} = {}) {
Expand All @@ -39,13 +40,16 @@ class ActivityCollector {
this.onbefore = typeof onbefore === 'function' ? onbefore : noop;
this.onafter = typeof onafter === 'function' ? onafter : noop;
this.ondestroy = typeof ondestroy === 'function' ? ondestroy : noop;
this.onpromiseResolve = typeof onpromiseResolve === 'function' ?
onpromiseResolve : noop;

// Create the hook with which we'll collect activity data
this._asyncHook = async_hooks.createHook({
init: this._init.bind(this),
before: this._before.bind(this),
after: this._after.bind(this),
destroy: this._destroy.bind(this)
destroy: this._destroy.bind(this),
promiseResolve: this._promiseResolve.bind(this)
});
}

Expand Down Expand Up @@ -206,6 +210,13 @@ class ActivityCollector {
this.ondestroy(uid);
}

_promiseResolve(uid) {
const h = this._getActivity(uid, 'promiseResolve');
this._stamp(h, 'promiseResolve');
this._maybeLog(uid, h && h.type, 'promiseResolve');
this.onpromiseResolve(uid);
}

_maybeLog(uid, type, name) {
if (this._logid &&
(type == null || this._logtype == null || this._logtype === type)) {
Expand All @@ -219,6 +230,7 @@ exports = module.exports = function initHooks({
onbefore,
onafter,
ondestroy,
onpromiseResolve,
allowNoInit,
logid,
logtype
Expand All @@ -228,6 +240,7 @@ exports = module.exports = function initHooks({
onbefore,
onafter,
ondestroy,
onpromiseResolve,
allowNoInit,
logid,
logtype
Expand Down