test,async_hooks: stabilize tests on Windows

test/async-hooks/test-emit-before-after.js

@@ -16,13 +16,13 @@ switch (process.argv[2]) {
 }
 
 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 ' +
                    'zero (asyncId: -1, triggerAsyncId: -1)');
 assert.strictEqual(c1.status, 1);
 
 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 ' +
                    'zero (asyncId: 1, triggerAsyncId: -1)');
 assert.strictEqual(c2.status, 1);

test/async-hooks/test-graph.signal.js

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

test/async-hooks/test-signalwrap.js

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

test/async-hooks/test-ttywrap.readstream.js

@@ -1,42 +1,44 @@
 'use strict';
-
 const common = require('../common');
 const assert = require('assert');
+
+// general hook test setup
 const tick = require('./tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
 
 const hooks = initHooks();
 hooks.enable();
 
-const ReadStream = require('tty').ReadStream;
-const ttyStream = new ReadStream(0);
-
-const as = hooks.activitiesOfTypes('TTYWRAP');
-assert.strictEqual(as.length, 1);
-const tty = as[0];
+// test specific setup
+const { ReadStream } = require('tty');
+const checkInitOpts = { init: 1 };
+const checkEndedOpts = { init: 1, before: 1, after: 1, destroy: 1 };
+
+// test code
+//
+// 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(typeof tty.uid, 'number');
 assert.strictEqual(typeof tty.triggerAsyncId, 'number');
-checkInvocations(tty, { init: 1 }, 'when tty created');
-
-ttyStream.end(common.mustCall(onend));
-
-checkInvocations(tty, { init: 1 }, 'when tty.end() was invoked ');
-
-function onend() {
-  tick(2, common.mustCall(() =>
-    checkInvocations(
-      tty, { init: 1, before: 1, after: 1, destroy: 1 },
-      'when tty ended ')
-  ));
-}
-
-process.on('exit', onexit);
-
-function onexit() {
+checkInvocations(tty, checkInitOpts, 'when tty created');
+const delayedOnCloseHandler = common.mustCall(() => {
+  checkInvocations(tty, checkEndedOpts, 'when tty ended');
+});
+ttyStream.on('error', (err) => assert.fail(err));
+ttyStream.on('close', common.mustCall(() =>
+  tick(2, delayedOnCloseHandler)
+));
+ttyStream.destroy();
+checkInvocations(tty, checkInitOpts, 'when tty.end() was invoked');
+
+process.on('exit', () => {
   hooks.disable();
   hooks.sanityCheck('TTYWRAP');
-  checkInvocations(tty, { init: 1, before: 1, after: 1, destroy: 1 },
-                   'when process exits');
-}
+  checkInvocations(tty, checkEndedOpts, 'when process exits');
+});

vcbuild.bat

@@ -44,7 +44,7 @@ set enable_static=
 set build_addons_napi=
 set test_node_inspect=
 set test_check_deopts=
-set js_test_suites=inspector known_issues message parallel sequential
+set js_test_suites=async-hooks inspector known_issues message parallel sequential
 set "common_test_suites=%js_test_suites% doctool addons addons-napi&set build_addons=1&set build_addons_napi=1"
 
 :next-arg
@@ -79,6 +79,7 @@ if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto
 if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
 if /i "%1"=="test-pummel"   set test_args=%test_args% pummel&goto arg-ok
 if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues&goto arg-ok
+if /i "%1"=="test-async-hooks"  set test_args=%test_args% async-hooks&goto arg-ok
 if /i "%1"=="test-all"      set test_args=%test_args% gc internet pummel %common_test_suites%&set build_testgc_addon=1&set cpplint=1&set jslint=1&goto arg-ok
 if /i "%1"=="test-node-inspect" set test_node_inspect=1&goto arg-ok
 if /i "%1"=="test-check-deopts" set test_check_deopts=1&goto arg-ok
@@ -494,7 +495,7 @@ echo Failed to create vc project files.
 goto exit
 
 :help
-echo vcbuild.bat [debug/release] [msi] [test/test-ci/test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS]
+echo vcbuild.bat [debug/release] [msi] [test/test-ci/test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message/test-async-hooks] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS]
 echo Examples:
 echo   vcbuild.bat                : builds release build
 echo   vcbuild.bat debug          : builds debug build