From 7e5bf48998f7bd0a512d7e5340e1614dfdc8cf97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 6 Dec 2020 10:07:47 +0100 Subject: build,lib,test: change whitelist to allowlist PR-URL: https://github.com/nodejs/node/pull/36406 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca Reviewed-By: Michael Dawson --- test/common/README.md | 8 ++--- test/common/index.js | 4 +-- ...st-process-binding-internalbinding-allowlist.js | 41 ++++++++++++++++++++++ ...st-process-binding-internalbinding-whitelist.js | 41 ---------------------- 4 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 test/parallel/test-process-binding-internalbinding-allowlist.js delete mode 100644 test/parallel/test-process-binding-internalbinding-whitelist.js (limited to 'test') diff --git a/test/common/README.md b/test/common/README.md index 5ce7473cb51..9bbc107dd85 100644 --- a/test/common/README.md +++ b/test/common/README.md @@ -40,12 +40,12 @@ The `benchmark` module is used by tests to run benchmarks. The `common` module is used by tests for consistency across repeated tasks. -### `allowGlobals(...whitelist)` +### `allowGlobals(...allowlist)` -* `whitelist` [<Array>][] Array of Globals +* `allowlist` [<Array>][] Array of Globals * return [<Array>][] -Takes `whitelist` and concats that with predefined `knownGlobals`. +Takes `allowlist` and concats that with predefined `knownGlobals`. ### `canCreateSymLink()` @@ -601,7 +601,7 @@ If set, crypto tests are skipped. ### `NODE_TEST_KNOWN_GLOBALS` A comma-separated list of variables names that are appended to the global -variable whitelist. Alternatively, if `NODE_TEST_KNOWN_GLOBALS` is set to `'0'`, +variable allowlist. Alternatively, if `NODE_TEST_KNOWN_GLOBALS` is set to `'0'`, global leak detection is disabled. ## Fixtures Module diff --git a/test/common/index.js b/test/common/index.js index 0952f5de52f..39caa1b6b68 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -276,8 +276,8 @@ if (global.gc) { knownGlobals.push(global.gc); } -function allowGlobals(...whitelist) { - knownGlobals = knownGlobals.concat(whitelist); +function allowGlobals(...allowlist) { + knownGlobals = knownGlobals.concat(allowlist); } if (process.env.NODE_TEST_KNOWN_GLOBALS !== '0') { diff --git a/test/parallel/test-process-binding-internalbinding-allowlist.js b/test/parallel/test-process-binding-internalbinding-allowlist.js new file mode 100644 index 00000000000..10667b843cd --- /dev/null +++ b/test/parallel/test-process-binding-internalbinding-allowlist.js @@ -0,0 +1,41 @@ +// Flags: --no-warnings +'use strict'; + +const common = require('../common'); +const assert = require('assert'); + +// Assert that allowed internalBinding modules are accessible via +// process.binding(). +assert(process.binding('async_wrap')); +assert(process.binding('buffer')); +assert(process.binding('cares_wrap')); +assert(process.binding('constants')); +assert(process.binding('contextify')); +if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check + assert(process.binding('crypto')); +} +assert(process.binding('fs')); +assert(process.binding('fs_event_wrap')); +assert(process.binding('http_parser')); +if (common.hasIntl) { + assert(process.binding('icu')); +} +assert(process.binding('inspector')); +assert(process.binding('js_stream')); +assert(process.binding('natives')); +assert(process.binding('os')); +assert(process.binding('pipe_wrap')); +assert(process.binding('signal_wrap')); +assert(process.binding('spawn_sync')); +assert(process.binding('stream_wrap')); +assert(process.binding('tcp_wrap')); +if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check + assert(process.binding('tls_wrap')); +} +assert(process.binding('tty_wrap')); +assert(process.binding('udp_wrap')); +assert(process.binding('url')); +assert(process.binding('util')); +assert(process.binding('uv')); +assert(process.binding('v8')); +assert(process.binding('zlib')); diff --git a/test/parallel/test-process-binding-internalbinding-whitelist.js b/test/parallel/test-process-binding-internalbinding-whitelist.js deleted file mode 100644 index 9768ef66741..00000000000 --- a/test/parallel/test-process-binding-internalbinding-whitelist.js +++ /dev/null @@ -1,41 +0,0 @@ -// Flags: --no-warnings -'use strict'; - -const common = require('../common'); -const assert = require('assert'); - -// Assert that whitelisted internalBinding modules are accessible via -// process.binding(). -assert(process.binding('async_wrap')); -assert(process.binding('buffer')); -assert(process.binding('cares_wrap')); -assert(process.binding('constants')); -assert(process.binding('contextify')); -if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check - assert(process.binding('crypto')); -} -assert(process.binding('fs')); -assert(process.binding('fs_event_wrap')); -assert(process.binding('http_parser')); -if (common.hasIntl) { - assert(process.binding('icu')); -} -assert(process.binding('inspector')); -assert(process.binding('js_stream')); -assert(process.binding('natives')); -assert(process.binding('os')); -assert(process.binding('pipe_wrap')); -assert(process.binding('signal_wrap')); -assert(process.binding('spawn_sync')); -assert(process.binding('stream_wrap')); -assert(process.binding('tcp_wrap')); -if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check - assert(process.binding('tls_wrap')); -} -assert(process.binding('tty_wrap')); -assert(process.binding('udp_wrap')); -assert(process.binding('url')); -assert(process.binding('util')); -assert(process.binding('uv')); -assert(process.binding('v8')); -assert(process.binding('zlib')); -- cgit v1.2.3