1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test,async_hooks: stabilize tests on Windows

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/13381
Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
This commit is contained in:
Refael Ackermann 2017-06-01 19:06:07 -04:00
parent 71ca122def
commit 372b85df4b
4 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/async-hooks/test-emit-before-after.js
View File

@ -16,13 +16,13 @@ switch (process.argv[2]) {
} }
const c1 = spawnSync(process.execPath, [__filename, 'test_invalid_async_id']); const c1 = spawnSync(process.execPath, [__filename, 'test_invalid_async_id']);
assert.strictEqual(c1.stderr.toString().split('\n')[0], assert.strictEqual(c1.stderr.toString().split(/[\r\n]+/g)[0],
'Error: before(): asyncId or triggerAsyncId is less than ' + 'Error: before(): asyncId or triggerAsyncId is less than ' +
'zero (asyncId: -1, triggerAsyncId: -1)'); 'zero (asyncId: -1, triggerAsyncId: -1)');
assert.strictEqual(c1.status, 1); assert.strictEqual(c1.status, 1);
const c2 = spawnSync(process.execPath, [__filename, 'test_invalid_trigger_id']); const c2 = spawnSync(process.execPath, [__filename, 'test_invalid_trigger_id']);
assert.strictEqual(c2.stderr.toString().split('\n')[0], assert.strictEqual(c2.stderr.toString().split(/[\r\n]+/g)[0],
'Error: before(): asyncId or triggerAsyncId is less than ' + 'Error: before(): asyncId or triggerAsyncId is less than ' +
'zero (asyncId: 1, triggerAsyncId: -1)'); 'zero (asyncId: 1, triggerAsyncId: -1)');
assert.strictEqual(c2.status, 1); assert.strictEqual(c2.status, 1);

5
test/async-hooks/test-graph.signal.js
View File

@ -1,6 +1,11 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
if (common.isWindows) {
common.skip('no signals on Windows');
return;
}
const initHooks = require('./init-hooks'); const initHooks = require('./init-hooks');
const verifyGraph = require('./verify-graph'); const verifyGraph = require('./verify-graph');
const exec = require('child_process').exec; const exec = require('child_process').exec;

4
test/async-hooks/test-signalwrap.js
View File

@ -1,6 +1,8 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
if (common.isWindows) return common.skip('no signals in Windows');
const assert = require('assert'); const assert = require('assert');
const initHooks = require('./init-hooks'); const initHooks = require('./init-hooks');
const { checkInvocations } = require('./hook-checks'); const { checkInvocations } = require('./hook-checks');

50
test/async-hooks/test-ttywrap.readstream.js
View File

@ -1,7 +1,8 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
const assert = require('assert'); const assert = require('assert');
// general hook test setup
const tick = require('./tick'); const tick = require('./tick');
const initHooks = require('./init-hooks'); const initHooks = require('./init-hooks');
const { checkInvocations } = require('./hook-checks'); const { checkInvocations } = require('./hook-checks');
@ -9,34 +10,35 @@ const { checkInvocations } = require('./hook-checks');
const hooks = initHooks(); const hooks = initHooks();
hooks.enable(); hooks.enable();
const ReadStream = require('tty').ReadStream; // test specific setup
const ttyStream = new ReadStream(0); const { ReadStream } = require('tty');
const checkInitOpts = { init: 1 };
const checkEndedOpts = { init: 1, before: 1, after: 1, destroy: 1 };
const as = hooks.activitiesOfTypes('TTYWRAP'); // test code
assert.strictEqual(as.length, 1); //
const tty = as[0]; // listen to stdin except on Windows
const targetFD = common.isWindows ? 1 : 0;
const ttyStream = new ReadStream(targetFD);
const activities = hooks.activitiesOfTypes('TTYWRAP');
assert.strictEqual(activities.length, 1);
const tty = activities[0];
assert.strictEqual(tty.type, 'TTYWRAP'); assert.strictEqual(tty.type, 'TTYWRAP');
assert.strictEqual(typeof tty.uid, 'number'); assert.strictEqual(typeof tty.uid, 'number');
assert.strictEqual(typeof tty.triggerAsyncId, 'number'); assert.strictEqual(typeof tty.triggerAsyncId, 'number');
checkInvocations(tty, { init: 1 }, 'when tty created'); checkInvocations(tty, checkInitOpts, 'when tty created');
const delayedOnCloseHandler = common.mustCall(() => {
ttyStream.end(common.mustCall(onend)); checkInvocations(tty, checkEndedOpts, 'when tty ended');
});
checkInvocations(tty, { init: 1 }, 'when tty.end() was invoked '); ttyStream.on('error', (err) => assert.fail(err));
ttyStream.on('close', common.mustCall(() =>
function onend() { tick(2, delayedOnCloseHandler)
tick(2, common.mustCall(() =>
checkInvocations(
tty, { init: 1, before: 1, after: 1, destroy: 1 },
'when tty ended ')
)); ));
} ttyStream.destroy();
checkInvocations(tty, checkInitOpts, 'when tty.end() was invoked');
process.on('exit', onexit); process.on('exit', () => {
function onexit() {
hooks.disable(); hooks.disable();
hooks.sanityCheck('TTYWRAP'); hooks.sanityCheck('TTYWRAP');
checkInvocations(tty, { init: 1, before: 1, after: 1, destroy: 1 }, checkInvocations(tty, checkEndedOpts, 'when process exits');
'when process exits'); });
}