diff --git a/test/parallel/test-child-process-spawnsync-validation-errors.js b/test/parallel/test-child-process-spawnsync-validation-errors.js index c12476c0422..17545d4af7b 100644 --- a/test/parallel/test-child-process-spawnsync-validation-errors.js +++ b/test/parallel/test-child-process-spawnsync-validation-errors.js @@ -3,18 +3,11 @@ const common = require('../common'); const assert = require('assert'); const spawnSync = require('child_process').spawnSync; const signals = process.binding('constants').os.signals; +const rootUser = common.isWindows ? false : process.getuid() === 0; -let invalidArgTypeError; -let invalidArgTypeErrorCount = 62; - -if (common.isWindows) { - invalidArgTypeError = - common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError }, 42); -} else { - invalidArgTypeError = - common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError }, - invalidArgTypeErrorCount); -} +const invalidArgTypeError = common.expectsError( + { code: 'ERR_INVALID_ARG_TYPE', type: TypeError }, + common.isWindows || rootUser ? 42 : 62); const invalidRangeError = common.expectsError({ code: 'ERR_OUT_OF_RANGE', type: RangeError }, 20); @@ -64,7 +57,7 @@ function fail(option, value, message) { if (!common.isWindows) { { // Validate the uid option - if (process.getuid() !== 0) { + if (!rootUser) { pass('uid', undefined); pass('uid', null); pass('uid', process.getuid()); @@ -78,9 +71,6 @@ if (!common.isWindows) { fail('uid', Infinity, invalidArgTypeError); fail('uid', 3.1, invalidArgTypeError); fail('uid', -3.1, invalidArgTypeError); - } else { - // Decrement invalidArgTypeErrorCount if validation isn't possible - invalidArgTypeErrorCount -= 10; } } @@ -100,9 +90,6 @@ if (!common.isWindows) { fail('gid', Infinity, invalidArgTypeError); fail('gid', 3.1, invalidArgTypeError); fail('gid', -3.1, invalidArgTypeError); - } else { - // Decrement invalidArgTypeErrorCount if validation isn't possible - invalidArgTypeErrorCount -= 10; } } }