From b64828d8df8141c2f3acfa07927d1d5c540cff52 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 23 Sep 2016 16:41:21 -0700 Subject: [PATCH] test: accept expected AIX result test-stdio-closed AIX handles closed stdio differently (but still compliant with spec as far as I can tell) than other POSIX variants we test. Test results are different than Linux and others because AIX takes measures to not re-use the file descriptors for stdio if one of the stdio streams is closed. Fixes: https://github.com/nodejs/node/issues/8375 PR-URL: https://github.com/nodejs/node/pull/8755 Reviewed-By: James M Snell Reviewed-By: Gibson Fahnestock Reviewed-By: Ilkka Myller --- test/parallel/parallel.status | 1 - test/parallel/test-stdio-closed.js | 30 ++++++++++++++++++++---------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status index fe35cb6da6333b..d5b68b9458ab2b 100644 --- a/test/parallel/parallel.status +++ b/test/parallel/parallel.status @@ -34,7 +34,6 @@ test-fs-watch-enoent : FAIL, PASS # Disable so we don't get failures now that AIX has been # added to regular CI runs test-regress-GH-1899 : FAIL, PASS -test-stdio-closed : FAIL, PASS # Flaky until https://github.com/nodejs/build/issues/415 is resolved. # On some of the buildbots, AAAA queries for localhost don't resolve diff --git a/test/parallel/test-stdio-closed.js b/test/parallel/test-stdio-closed.js index 0f94289ee96534..a85467f76a6d0f 100644 --- a/test/parallel/test-stdio-closed.js +++ b/test/parallel/test-stdio-closed.js @@ -1,7 +1,7 @@ 'use strict'; -var common = require('../common'); -var assert = require('assert'); -var spawn = require('child_process').spawn; +const common = require('../common'); +const assert = require('assert'); +const spawn = require('child_process').spawn; if (common.isWindows) { common.skip('platform not supported.'); @@ -9,18 +9,28 @@ if (common.isWindows) { } if (process.argv[2] === 'child') { - process.stdout.write('stdout', function() { - process.stderr.write('stderr', function() { - process.exit(42); + try { + process.stdout.write('stdout', function() { + try { + process.stderr.write('stderr', function() { + process.exit(42); + }); + } catch (e) { + process.exit(84); + } }); - }); + } catch (e) { + assert.strictEqual(e.code, 'EBADF'); + assert.strictEqual(e.message, 'EBADF: bad file descriptor, write'); + process.exit(126); + } return; } // Run the script in a shell but close stdout and stderr. -var cmd = `"${process.execPath}" "${__filename}" child 1>&- 2>&-`; -var proc = spawn('/bin/sh', ['-c', cmd], { stdio: 'inherit' }); +const cmd = `"${process.execPath}" "${__filename}" child 1>&- 2>&-`; +const proc = spawn('/bin/sh', ['-c', cmd], { stdio: 'inherit' }); proc.on('exit', common.mustCall(function(exitCode) { - assert.equal(exitCode, 42); + assert.strictEqual(exitCode, common.isAix ? 126 : 42); }));