Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a1aff28
deps: cherry-pick 525b396 from V8 upstream
psmarshall Dec 14, 2018
b17819d
doc: update the http.request.setTimeout docs to be accurate
jbunton-atlassian Dec 19, 2018
fbafe8d
test: fix test-repl-envvars
addaleax Dec 26, 2018
759a018
n-api: add API for asynchronous functions
Jun 17, 2018
c5a11dc
n-api: fix compiler warning
cjihrig Jun 29, 2018
3675059
n-api: guard against cond null dereference
Jul 18, 2018
67b6e0d
src: fix may be uninitialized warning in n-api
mhdawson Jul 19, 2018
09b88aa
n-api: remove idle_running from TsFn
Jul 27, 2018
902b079
n-api: clean up thread-safe function
Aug 11, 2018
6b7cccc
doc: fix optional parameters in n-api.md
Sep 21, 2018
fe43282
n-api: add missing handle scopes
danbev Oct 31, 2018
60db455
test: mark test_threadsafe_function/test as flaky
gireeshpunathil Nov 29, 2018
d4b6643
test: mark test-cli-node-options flaky on arm
Trott Dec 14, 2018
f6ff8c5
test: fix module loading error for AIX 7.1
richardlau Jan 9, 2019
e936907
build: set `-blibpath:` for AIX
richardlau Jan 11, 2019
1a9582b
tools: allow input for TTY tests
addaleax Sep 24, 2018
ea5628e
process: allow reading from stdout/stderr sockets
addaleax Sep 24, 2018
c56f3ed
test: add stdin writable regression test
addaleax Sep 24, 2018
b4c5435
test: add process.stdin.end() TTY regression test
mcollina Sep 17, 2018
44609d1
n-api: restrict exports by version
kfarnung Dec 7, 2017
d6ffabc
n-api: mark thread-safe function as stable
Jan 22, 2019
1d86261
http: attach reused parser to correct domain
Jan 11, 2019
ac9b8f7
http: fix error check in `Execute()`
mscdex Feb 5, 2019
2b2ad96
n-api: finalize during second-pass callback
Feb 7, 2019
6352288
build: add loader path to rpath for cctest
rubys Sep 29, 2018
c07ba96
build: skip cctest on Windows shared lib build
yhwang Jul 24, 2018
91620b8
tls: fix legacy SecurePair session resumption
bnoordhuis Mar 5, 2019
7573b55
tls: fix legacy SecurePair clienthello race window
bnoordhuis Mar 5, 2019
97cc0fc
deps: V8: cherry-pick 3cc6919
Feb 1, 2019
3128cb7
test: avoid running fsync on directory on AIX
jBarz Jun 13, 2018
eaf474c
test: shared lib build doesn't handle SIGPIPE
yhwang Mar 7, 2018
705935d
assert: fix backport regression
BridgeAR Apr 12, 2019
d3de1ed
n-api: improve performance creating strings
anthony-tuininga Mar 4, 2019
5f93cf7
2019-04-16, Version 8.16.0 'Carbon' (LTS)
MylesBorins Mar 26, 2019
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
assert: fix backport regression
This fixes a regression for an error case with `assert.rejects` and
`assert.doesNotReject`.

Fixes: #27185

PR-URL: #27202
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Beth Griggs <[email protected]>
  • Loading branch information
BridgeAR authored and MylesBorins committed Apr 16, 2019
commit 705935d62059d92543cda43c8cdb29bc34082d5e
3 changes: 2 additions & 1 deletion lib/assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,8 @@ function getActual(block) {

async function waitForActual(block) {
if (typeof block !== 'function') {
throw new errors.ERR_INVALID_ARG_TYPE('block', 'Function', block);
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'block', 'Function',
block);
}

// Return a rejected promise if `block` throws synchronously.
Expand Down