From 6a85ad9391e34a66d1cac87549cb06e742f37ed9 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 10 Feb 2016 15:56:26 -0500 Subject: [PATCH] test: disable fs watch tests for AIX fs watch currently needs special configuration on AIX and we want to improve under https://github.com/nodejs/node/issues/5085. Tests are disabled so CI can be green and we can spot other regressions until this work is complete. test-async-wrap-check-providers does not aim to test fs watch but part of the test uses it so that part has been skipped for AIX PR-URL: https://github.com/nodejs/node/pull/5187 Reviewed-By: James M Snell Reviewed-By: Ben Noordhuis --- test/parallel/parallel.status | 7 ++++++ .../test-async-wrap-check-providers.js | 22 ++++++++++++++++--- test/sequential/sequential.status | 6 +++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status index 1e27e5c772..7e83494394 100644 --- a/test/parallel/parallel.status +++ b/test/parallel/parallel.status @@ -20,3 +20,10 @@ test-tick-processor : PASS,FLAKY [$system==solaris] # Also applies to SmartOS [$system==freebsd] + +# fs-watch currently needs special configuration on AIX and we +# want to improve under https://github.com/nodejs/node/issues/5085. +# Tests are disabled so CI can be green and we can spot other +# regressions until this work is complete +[$system==aix] +test-fs-watch-enoent : FAIL, PASS diff --git a/test/parallel/test-async-wrap-check-providers.js b/test/parallel/test-async-wrap-check-providers.js index 38302be2cd..907b9fa315 100644 --- a/test/parallel/test-async-wrap-check-providers.js +++ b/test/parallel/test-async-wrap-check-providers.js @@ -18,6 +18,16 @@ let keyList = pkeys.slice(); // Drop NONE keyList.splice(0, 1); +// fs-watch currently needs special configuration on AIX and we +// want to improve under https://github.com/nodejs/node/issues/5085. +// strip out fs watch related parts for now +if (common.isAix) { + for (var i = 0; i < keyList.length; i++) { + if ((keyList[i] === 'FSEVENTWRAP') || (keyList[i] === 'STATWATCHER')) { + keyList.splice(i, 1); + } + } +} function init(id) { keyList = keyList.filter((e) => e != pkeys[id]); @@ -33,9 +43,15 @@ async_wrap.enable(); setTimeout(function() { }); fs.stat(__filename, noop); -fs.watchFile(__filename, noop); -fs.unwatchFile(__filename); -fs.watch(__filename).close(); + +if (!common.isAix) { + // fs-watch currently needs special configuration on AIX and we + // want to improve under https://github.com/nodejs/node/issues/5085. + // strip out fs watch related parts for now + fs.watchFile(__filename, noop); + fs.unwatchFile(__filename); + fs.watch(__filename).close(); +} dns.lookup('localhost', noop); dns.lookupService('::', 0, noop); diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status index ddf864ea40..ac5eaedf89 100644 --- a/test/sequential/sequential.status +++ b/test/sequential/sequential.status @@ -17,3 +17,9 @@ test-vm-syntax-error-stderr : PASS,FLAKY [$system==freebsd] +# fs-watch currently needs special configuration on AIX and we +# want to improve under https://github.com/nodejs/node/issues/5085. +# Tests are disabled so CI can be green and we can spot other +# regressions until this work is complete +[$system==aix] +test-fs-watch : FAIL, PASS