Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
dc5d445
build: macOS package notarization
rvagg Jan 22, 2020
8c6f80f
deps: update term-size with signed version
rvagg Jan 30, 2020
95cfd4f
doc: official macOS builds now on 10.15 + Xcode 11
rvagg Mar 4, 2020
5b9ce00
meta: move inactive collaborators to emeriti
Trott Mar 8, 2020
c5a3bfd
doc: add Ruben to TSC
mhdawson Mar 11, 2020
0594de4
deps: upgrade npm to 6.14.1
isaacs Feb 27, 2020
055b3b9
lib: change var to let/const
himself65 Mar 2, 2020
6e1f0fe
test: fix test-tls-env-extra-ca-file-load
ebickle Mar 3, 2020
04f2caa
src: refactor to more safe method
gengjiawen Mar 4, 2020
0dd6e4a
test: `buffer.write` with longer string scenario
HarshithaKP Mar 6, 2020
2232399
lib: use spread operator on cluster
himself65 Mar 6, 2020
2428afb
build: disable libstdc++ debug containers globally
bnoordhuis Jan 3, 2020
975d6b0
util: use a global symbol for `util.promisify.custom`
ExE-Boss Feb 7, 2020
038a463
doc: expand fs.watch caveats
bzoz Mar 10, 2020
969b0b7
repl: align preview with the actual executed code
BridgeAR Feb 24, 2020
4d744c3
test: refactor and simplify test-repl-preview
BridgeAR Mar 9, 2020
ce58e02
doc: update conditional exports recommendations
guybedford Mar 4, 2020
435fbbc
worker: allow URL in Worker constructor
aduh95 Feb 6, 2020
45513c0
test: use portable EOL
HarshithaKP Mar 5, 2020
32dbc7a
http2: rename counter in `mapToHeaders` inner loop
mkrawczuk Feb 28, 2020
fc2909a
test: add new scenario for async-local storage
HarshithaKP Mar 4, 2020
612ee7d
deps: V8: cherry-pick f9257802c1c0
mmarchini Mar 10, 2020
3845754
util: text decoding allows SharedArrayBuffer
bfarias-godaddy Mar 11, 2020
d2857c7
esm: port loader code to JS
addaleax Mar 7, 2020
3649a7e
test: verify that WASI errors are rethrown
cjihrig Mar 9, 2020
c906c40
deps: upgrade to libuv 1.35.0
cjihrig Mar 11, 2020
04843b9
tools: update to acorn@7.1.1
Trott Mar 14, 2020
0a22384
test: make test-memory-usage predictable
mmarchini Mar 12, 2020
3c0ce69
src: fix warn_unused_result compiler warning
cjihrig Mar 13, 2020
70fe3be
test: workaround for V8 8.1 inspector pause issue
mmarchini Mar 12, 2020
63bf0f1
src: find .text section using dl_iterate_phdr
Mar 13, 2020
29d7863
stream: don't emit 'finish' after 'error'
ronag Mar 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: fix test-tls-env-extra-ca-file-load
Fixes broken unit test for the NODE_EXTRA_CA_CERTS environment
variable. Unit test was exiting without evaluating any assertions
or running any tests.

Fixes: #32072

PR-URL: #32073
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
  • Loading branch information
ebickle authored and BridgeAR committed Mar 17, 2020
commit 6e1f0fe87987f83f975d027c36a83023071efe1e
17 changes: 9 additions & 8 deletions test/parallel/test-tls-env-extra-ca-file-load.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ const { fork } = require('child_process');

// This test ensures that extra certificates are loaded at startup.
if (process.argv[2] !== 'child') {
if (process.env.CHILD_USE_EXTRA_CA_CERTS === 'yes') {
assert.strictEqual(binding.isExtraRootCertsFileLoaded(), true);
} else if (process.env.CHILD_USE_EXTRA_CA_CERTS === 'no') {
assert.strictEqual(binding.isExtraRootCertsFileLoaded(), false);
tls.createServer({});
assert.strictEqual(binding.isExtraRootCertsFileLoaded(), false);
}
} else {
// Parent
const NODE_EXTRA_CA_CERTS = fixtures.path('keys', 'ca1-cert.pem');
const extendsEnv = (obj) => ({ ...process.env, ...obj });

Expand All @@ -37,4 +30,12 @@ if (process.argv[2] !== 'child') {
assert.strictEqual(status, 0);
}));
});
} else if (process.env.CHILD_USE_EXTRA_CA_CERTS === 'yes') {
// Child with extra certificates loaded at startup.
assert.strictEqual(binding.isExtraRootCertsFileLoaded(), true);
} else {
// Child without extra certificates.
assert.strictEqual(binding.isExtraRootCertsFileLoaded(), false);
tls.createServer({});
assert.strictEqual(binding.isExtraRootCertsFileLoaded(), false);
}