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

test: remove common.isOSXMojave

Browse Source 
common.isOSXMojave was added because it was believed that there was a
bug in macOS Mojave that allowed unprivileged users to bind to
privileged ports. As it turns out, that was a feature not a bug. It is
likely to be in all future versions of macOS. Remove isOSXMojave and
skip appropriate tests based on isOSX.

Refs: https://news.ycombinator.com/item?id=18302380
PR-URL: https://github.com/nodejs/node/pull/25658
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
This commit is contained in:
Rich Trott 2019-01-22 19:27:14 -08:00
parent 7d27f0e9d0
commit 399ef4f536
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/common/index.js
View File

@ -99,8 +99,6 @@ const isOpenBSD = process.platform === 'openbsd';
const isLinux = process.platform === 'linux'; const isLinux = process.platform === 'linux';
const isOSX = process.platform === 'darwin'; const isOSX = process.platform === 'darwin';
const isOSXMojave = isOSX && (os.release().startsWith('18'));
const enoughTestMem = os.totalmem() > 0x70000000; /* 1.75 Gb */ const enoughTestMem = os.totalmem() > 0x70000000; /* 1.75 Gb */
const cpus = os.cpus(); const cpus = os.cpus();
const enoughTestCpu = Array.isArray(cpus) && const enoughTestCpu = Array.isArray(cpus) &&
@ -739,7 +737,6 @@ module.exports = {
isMainThread, isMainThread,
isOpenBSD, isOpenBSD,
isOSX, isOSX,
isOSXMojave,
isSunOS, isSunOS,
isWindows, isWindows,
localIPv6Hosts, localIPv6Hosts,

4
test/parallel/test-cluster-bind-privileged-port.js
View File

@ -23,8 +23,8 @@
const common = require('../common'); const common = require('../common');
// Skip on OS X Mojave. https://github.com/nodejs/node/issues/21679 // Skip on OS X Mojave. https://github.com/nodejs/node/issues/21679
if (common.isOSXMojave) if (common.isOSX)
common.skip('bypass test for Mojave due to OSX issue'); common.skip('macOS may allow ordinary processes to use any port');
if (common.isWindows) if (common.isWindows)
common.skip('not reliable on Windows.'); common.skip('not reliable on Windows.');

4
test/parallel/test-cluster-shared-handle-bind-privileged-port.js
View File

@ -23,8 +23,8 @@
const common = require('../common'); const common = require('../common');
// Skip on OS X Mojave. https://github.com/nodejs/node/issues/21679 // Skip on OS X Mojave. https://github.com/nodejs/node/issues/21679
if (common.isOSXMojave) if (common.isOSX)
common.skip('bypass test for Mojave due to OSX issue'); common.skip('macOS may allow ordinary processes to use any port');
if (common.isWindows) if (common.isWindows)
common.skip('not reliable on Windows'); common.skip('not reliable on Windows');