Skip to content

Commit 1905f8e

Browse files
Trottaddaleax
authored andcommitted
test: remove common.isOSXMojave
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: #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>
1 parent c93e5e1 commit 1905f8e

3 files changed

+4
-7
lines changed

test/common/index.js

-3
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ const isOpenBSD = process.platform === 'openbsd';
9999
const isLinux = process.platform === 'linux';
100100
const isOSX = process.platform === 'darwin';
101101

102-
const isOSXMojave = isOSX && (os.release().startsWith('18'));
103-
104102
const enoughTestMem = os.totalmem() > 0x70000000; /* 1.75 Gb */
105103
const cpus = os.cpus();
106104
const enoughTestCpu = Array.isArray(cpus) &&
@@ -750,7 +748,6 @@ module.exports = {
750748
isMainThread,
751749
isOpenBSD,
752750
isOSX,
753-
isOSXMojave,
754751
isSunOS,
755752
isWindows,
756753
localIPv6Hosts,

test/parallel/test-cluster-bind-privileged-port.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
const common = require('../common');
2424

2525
// Skip on OS X Mojave. https://github.com/nodejs/node/issues/21679
26-
if (common.isOSXMojave)
27-
common.skip('bypass test for Mojave due to OSX issue');
26+
if (common.isOSX)
27+
common.skip('macOS may allow ordinary processes to use any port');
2828

2929
if (common.isWindows)
3030
common.skip('not reliable on Windows.');

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
const common = require('../common');
2424

2525
// Skip on OS X Mojave. https://github.com/nodejs/node/issues/21679
26-
if (common.isOSXMojave)
27-
common.skip('bypass test for Mojave due to OSX issue');
26+
if (common.isOSX)
27+
common.skip('macOS may allow ordinary processes to use any port');
2828

2929
if (common.isWindows)
3030
common.skip('not reliable on Windows');

0 commit comments

Comments
 (0)