From 31cd05c39fe42c0bf0c0671068585efa4e764dda Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 23 Oct 2023 19:55:50 +0200 Subject: [PATCH] test: ensure never settling promises are detected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/50318 Reviewed-By: Michaël Zasso Reviewed-By: Colin Ihrig Reviewed-By: Moshe Atlow Reviewed-By: Yagiz Nizipli Reviewed-By: Filip Skokan Reviewed-By: Luigi Pinca --- test/.eslintrc.yaml | 2 + test/es-module/test-esm-cjs-named-error.mjs | 16 ++-- test/internet/test-dns-lookup.js | 4 +- test/parallel/test-blob.js | 4 +- ...pto-webcrypto-aes-decrypt-tag-too-small.js | 6 +- test/parallel/test-directory-import.js | 6 +- test/parallel/test-dns-lookup.js | 2 +- .../test-dns-lookupService-promises.js | 2 +- test/parallel/test-dns-lookupService.js | 2 +- test/parallel/test-dns-resolve-promises.js | 4 +- .../test-event-emitter-error-monitor.js | 2 +- test/parallel/test-file-validate-mode-flag.js | 4 +- test/parallel/test-filehandle-close.js | 2 +- .../test-fs-filehandle-use-after-close.js | 2 +- test/parallel/test-fs-lchmod.js | 4 +- test/parallel/test-fs-open.js | 4 +- test/parallel/test-fs-promises-readfile.js | 4 +- test/parallel/test-fs-promises-watch.js | 12 +-- test/parallel/test-fs-promises.js | 14 ++-- test/parallel/test-fs-read-empty-buffer.js | 2 +- test/parallel/test-stream-consumers.js | 12 +-- test/parallel/test-stream-readable-destroy.js | 2 +- test/parallel/test-stream-reduce.js | 8 +- test/parallel/test-vm-module-cached-data.js | 4 +- .../test-vm-timeout-escape-promise-module.js | 2 +- .../test-webcrypto-export-import-cfrg.js | 4 +- .../test-webcrypto-export-import-rsa.js | 4 +- .../test-webstream-readablestream-pipeto.js | 4 +- .../test-whatwg-readablebytestream.js | 6 +- test/parallel/test-whatwg-readablestream.js | 76 ++++++++++--------- ...g-webstreams-adapters-to-readablestream.js | 4 +- ...treams-adapters-to-readablewritablepair.js | 18 ++--- ...g-webstreams-adapters-to-streamreadable.js | 4 +- ...g-webstreams-adapters-to-streamwritable.js | 4 +- ...g-webstreams-adapters-to-writablestream.js | 4 +- .../test-whatwg-webstreams-transfer.js | 12 +-- test/parallel/test-whatwg-writablestream.js | 16 ++-- ...worker-message-port-transfer-filehandle.js | 2 +- ...test-vm-timeout-escape-promise-module-2.js | 2 +- test/wasi/test-wasi-not-started.js | 4 +- 40 files changed, 147 insertions(+), 143 deletions(-) diff --git a/test/.eslintrc.yaml b/test/.eslintrc.yaml index ef1336e34c79dc..1c1cfd4ef93e9a 100644 --- a/test/.eslintrc.yaml +++ b/test/.eslintrc.yaml @@ -49,6 +49,8 @@ rules: message: Use 'test' as debuglog value in tests. - selector: CallExpression:matches([callee.object.name="common"][callee.property.name=/^must(Not)?Call/],[callee.name="mustCall"],[callee.name="mustCallAtLeast"],[callee.name="mustNotCall"])>:first-child[type=/FunctionExpression$/][body.body.length=0] message: Do not use an empty function, omit the parameter altogether. + - selector: ExpressionStatement>CallExpression:matches([callee.name='rejects'], [callee.object.name='assert'][callee.property.name='rejects']) + message: Calling `assert.rejects` without `await` or `.then(common.mustCall())` will not detect never-settling promises. - selector: Identifier[name='webcrypto'] message: Use `globalThis.crypto`. diff --git a/test/es-module/test-esm-cjs-named-error.mjs b/test/es-module/test-esm-cjs-named-error.mjs index 4ef75a22f92674..548f82b591da3b 100644 --- a/test/es-module/test-esm-cjs-named-error.mjs +++ b/test/es-module/test-esm-cjs-named-error.mjs @@ -23,55 +23,55 @@ const expectedPackageHack = const expectedBare = errTemplate('deep-fail', 'comeOn', '{ comeOn }'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/single-quote.mjs`); }, { name: 'SyntaxError', message: expectedRelative }, 'should support relative specifiers with single quotes'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/double-quote.mjs`); }, { name: 'SyntaxError', message: expectedRelative }, 'should support relative specifiers with double quotes'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/renamed-import.mjs`); }, { name: 'SyntaxError', message: expectedRenamed }, 'should correctly format named imports with renames'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/multi-line.mjs`); }, { name: 'SyntaxError', message: expectedWithoutExample, }, 'should correctly format named imports across multiple lines'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/json-hack.mjs`); }, { name: 'SyntaxError', message: expectedPackageHack }, 'should respect recursive package.json for module type'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/bare-import-single.mjs`); }, { name: 'SyntaxError', message: expectedBare }, 'should support bare specifiers with single quotes'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/bare-import-double.mjs`); }, { name: 'SyntaxError', message: expectedBare }, 'should support bare specifiers with double quotes'); -rejects(async () => { +await rejects(async () => { await import(`${fixtureBase}/escaped-single-quote.mjs`); }, /import pkg from '\.\/oh'no\.cjs'/, 'should support relative specifiers with escaped single quote'); diff --git a/test/internet/test-dns-lookup.js b/test/internet/test-dns-lookup.js index 6b06801dd1afb8..269c3cc91f2a68 100644 --- a/test/internet/test-dns-lookup.js +++ b/test/internet/test-dns-lookup.js @@ -17,7 +17,7 @@ assert.rejects( code: 'ENOTFOUND', message: `getaddrinfo ENOTFOUND ${addresses.NOT_FOUND}`, }, -); +).then(common.mustCall()); assert.rejects( dnsPromises.lookup(addresses.NOT_FOUND, { @@ -29,7 +29,7 @@ assert.rejects( code: 'ENOTFOUND', message: `getaddrinfo ENOTFOUND ${addresses.NOT_FOUND}`, }, -); +).then(common.mustCall()); dns.lookup(addresses.NOT_FOUND, { hints: 0, diff --git a/test/parallel/test-blob.js b/test/parallel/test-blob.js index cb9e2f239547f0..330fd79c742d77 100644 --- a/test/parallel/test-blob.js +++ b/test/parallel/test-blob.js @@ -409,10 +409,10 @@ assert.throws(() => new Blob({}), { } (async () => { - assert.rejects(async () => Blob.prototype.arrayBuffer.call(), { + await assert.rejects(async () => Blob.prototype.arrayBuffer.call(), { code: 'ERR_INVALID_THIS', }); - assert.rejects(async () => Blob.prototype.text.call(), { + await assert.rejects(async () => Blob.prototype.text.call(), { code: 'ERR_INVALID_THIS', }); })().then(common.mustCall()); diff --git a/test/parallel/test-crypto-webcrypto-aes-decrypt-tag-too-small.js b/test/parallel/test-crypto-webcrypto-aes-decrypt-tag-too-small.js index 555876b3994e64..589a2f91a17cc2 100644 --- a/test/parallel/test-crypto-webcrypto-aes-decrypt-tag-too-small.js +++ b/test/parallel/test-crypto-webcrypto-aes-decrypt-tag-too-small.js @@ -16,7 +16,7 @@ subtle.importKey( }, false, [ 'encrypt', 'decrypt' ]) - .then((k) => { + .then((k) => assert.rejects(() => { return subtle.decrypt({ name: 'AES-GCM', @@ -25,5 +25,5 @@ subtle.importKey( }, { name: 'OperationError', message: /The provided data is too small/, - }); - }); + }) + ).then(common.mustCall()); diff --git a/test/parallel/test-directory-import.js b/test/parallel/test-directory-import.js index 83fd01f6a0f214..36ba5a9ac94d5f 100644 --- a/test/parallel/test-directory-import.js +++ b/test/parallel/test-directory-import.js @@ -1,14 +1,14 @@ 'use strict'; -require('../common'); +const common = require('../common'); const fixtures = require('../common/fixtures'); const assert = require('assert'); const { pathToFileURL } = require('url'); { - assert.rejects(import('./'), /ERR_UNSUPPORTED_DIR_IMPORT/); + assert.rejects(import('./'), /ERR_UNSUPPORTED_DIR_IMPORT/).then(common.mustCall()); assert.rejects( import(pathToFileURL(fixtures.path('packages', 'main'))), /Did you mean/, - ); + ).then(common.mustCall()); } diff --git a/test/parallel/test-dns-lookup.js b/test/parallel/test-dns-lookup.js index a847a91d655196..2ee4ff2929624f 100644 --- a/test/parallel/test-dns-lookup.js +++ b/test/parallel/test-dns-lookup.js @@ -205,4 +205,4 @@ tickValue = 1; // Should fail due to stub. assert.rejects(dnsPromises.lookup('example.com'), - { code: 'ENOMEM', hostname: 'example.com' }); + { code: 'ENOMEM', hostname: 'example.com' }).then(common.mustCall()); diff --git a/test/parallel/test-dns-lookupService-promises.js b/test/parallel/test-dns-lookupService-promises.js index 4052139c922389..7b8eefb068af50 100644 --- a/test/parallel/test-dns-lookupService-promises.js +++ b/test/parallel/test-dns-lookupService-promises.js @@ -16,4 +16,4 @@ dnsPromises.lookupService('127.0.0.1', 22).then(common.mustCall((result) => { assert.rejects( () => dnsPromises.lookupService('192.0.2.1', 22), { code: /^(?:ENOTFOUND|EAI_AGAIN)$/ } -); +).then(common.mustCall()); diff --git a/test/parallel/test-dns-lookupService.js b/test/parallel/test-dns-lookupService.js index dc04893c28f9fd..aa29b1978f8a86 100644 --- a/test/parallel/test-dns-lookupService.js +++ b/test/parallel/test-dns-lookupService.js @@ -32,4 +32,4 @@ assert.rejects( message: 'getnameinfo ENOENT 127.0.0.1', syscall: 'getnameinfo' } -); +).then(common.mustCall()); diff --git a/test/parallel/test-dns-resolve-promises.js b/test/parallel/test-dns-resolve-promises.js index 783ed2a709edb6..298d9f667891a5 100644 --- a/test/parallel/test-dns-resolve-promises.js +++ b/test/parallel/test-dns-resolve-promises.js @@ -1,6 +1,6 @@ // Flags: --expose-internals 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const { internalBinding } = require('internal/test/binding'); const cares = internalBinding('cares_wrap'); @@ -17,4 +17,4 @@ assert.rejects( syscall: 'queryA', hostname: 'example.org' } -); +).then(common.mustCall()); diff --git a/test/parallel/test-event-emitter-error-monitor.js b/test/parallel/test-event-emitter-error-monitor.js index 2b22b425b29194..8254fc6254a7cd 100644 --- a/test/parallel/test-event-emitter-error-monitor.js +++ b/test/parallel/test-event-emitter-error-monitor.js @@ -25,7 +25,7 @@ EE.emit('error', theErr); // Verify it works with once process.nextTick(() => EE.emit('error', theErr)); -assert.rejects(EventEmitter.once(EE, 'notTriggered'), theErr); +assert.rejects(EventEmitter.once(EE, 'notTriggered'), theErr).then(common.mustCall()); // Only error events trigger error monitor EE.on('aEvent', common.mustCall()); diff --git a/test/parallel/test-file-validate-mode-flag.js b/test/parallel/test-file-validate-mode-flag.js index bb9871ae318d5f..62a9ef2ca2a059 100644 --- a/test/parallel/test-file-validate-mode-flag.js +++ b/test/parallel/test-file-validate-mode-flag.js @@ -33,8 +33,8 @@ assert.throws(() => openSync(__filename, 0, invalid), { assert.rejects(openPromise(__filename, invalid), { code: 'ERR_OUT_OF_RANGE' -}); +}).then(common.mustCall()); assert.rejects(openPromise(__filename, 0, invalid), { code: 'ERR_OUT_OF_RANGE' -}); +}).then(common.mustCall()); diff --git a/test/parallel/test-filehandle-close.js b/test/parallel/test-filehandle-close.js index 457b06a486f90f..6e55f3f06d19e7 100644 --- a/test/parallel/test-filehandle-close.js +++ b/test/parallel/test-filehandle-close.js @@ -10,7 +10,7 @@ const fs = require('fs'); const fh = await fs.promises.open(__filename); fs.closeSync(fh.fd); - assert.rejects(() => fh.close(), { + await assert.rejects(() => fh.close(), { code: 'EBADF', syscall: 'close' }); diff --git a/test/parallel/test-fs-filehandle-use-after-close.js b/test/parallel/test-fs-filehandle-use-after-close.js index 7b99e41cd02284..18216b4f4154e6 100644 --- a/test/parallel/test-fs-filehandle-use-after-close.js +++ b/test/parallel/test-fs-filehandle-use-after-close.js @@ -16,7 +16,7 @@ const fs = require('fs').promises; // See https://github.com/nodejs/node/issues/31361 for more details. const otherFilehandle = await fs.open(process.execPath); - assert.rejects(() => filehandle.stat(), { + await assert.rejects(() => filehandle.stat(), { code: 'EBADF', syscall: 'fstat' }); diff --git a/test/parallel/test-fs-lchmod.js b/test/parallel/test-fs-lchmod.js index ae5cb3ba2a230a..877aea3376554d 100644 --- a/test/parallel/test-fs-lchmod.js +++ b/test/parallel/test-fs-lchmod.js @@ -42,7 +42,7 @@ assert.throws(() => fs.lchmod(f, {}), { code: 'ERR_INVALID_ARG_TYPE' }); code: 'ERR_INVALID_ARG_TYPE', }; - assert.rejects(promises.lchmod(f, input, () => {}), errObj); + assert.rejects(promises.lchmod(f, input, () => {}), errObj).then(common.mustCall()); assert.throws(() => fs.lchmodSync(f, input), errObj); }); @@ -61,6 +61,6 @@ assert.throws(() => fs.lchmodSync(f, '123x'), { `4294967295. Received ${input}` }; - assert.rejects(promises.lchmod(f, input, () => {}), errObj); + assert.rejects(promises.lchmod(f, input, () => {}), errObj).then(common.mustCall()); assert.throws(() => fs.lchmodSync(f, input), errObj); }); diff --git a/test/parallel/test-fs-open.js b/test/parallel/test-fs-open.js index 29580019db6f61..0855e521f7091f 100644 --- a/test/parallel/test-fs-open.js +++ b/test/parallel/test-fs-open.js @@ -94,7 +94,7 @@ for (const extra of [[], ['r'], ['r', 0], ['r', 0, 'bad callback']]) { code: 'ERR_INVALID_ARG_TYPE', name: 'TypeError' } - ); + ).then(common.mustCall()); }); // Check invalid modes. @@ -116,5 +116,5 @@ for (const extra of [[], ['r'], ['r', 0], ['r', 0, 'bad callback']]) { { code: 'ERR_INVALID_ARG_TYPE' } - ); + ).then(common.mustCall()); }); diff --git a/test/parallel/test-fs-promises-readfile.js b/test/parallel/test-fs-promises-readfile.js index 30305568f6e087..9bce123537add6 100644 --- a/test/parallel/test-fs-promises-readfile.js +++ b/test/parallel/test-fs-promises-readfile.js @@ -46,7 +46,7 @@ function validateReadFileAbortLogicBefore() { const signal = AbortSignal.abort(); assert.rejects(readFile(fn, { signal }), { name: 'AbortError' - }); + }).then(common.mustCall()); } function validateReadFileAbortLogicDuring() { @@ -55,7 +55,7 @@ function validateReadFileAbortLogicDuring() { process.nextTick(() => controller.abort()); assert.rejects(readFile(fn, { signal }), { name: 'AbortError' - }); + }).then(common.mustCall()); } async function validateWrongSignalParam() { diff --git a/test/parallel/test-fs-promises-watch.js b/test/parallel/test-fs-promises-watch.js index 780a0d2dfaaa1f..94ef7fcb2abe30 100644 --- a/test/parallel/test-fs-promises-watch.js +++ b/test/parallel/test-fs-promises-watch.js @@ -79,42 +79,42 @@ assert.rejects( // eslint-disable-next-line no-unused-vars, no-empty for await (const _ of watch(1)) { } }, - { code: 'ERR_INVALID_ARG_TYPE' }); + { code: 'ERR_INVALID_ARG_TYPE' }).then(common.mustCall()); assert.rejects( async () => { // eslint-disable-next-line no-unused-vars, no-empty for await (const _ of watch(__filename, 1)) { } }, - { code: 'ERR_INVALID_ARG_TYPE' }); + { code: 'ERR_INVALID_ARG_TYPE' }).then(common.mustCall()); assert.rejects( async () => { // eslint-disable-next-line no-unused-vars, no-empty for await (const _ of watch('', { persistent: 1 })) { } }, - { code: 'ERR_INVALID_ARG_TYPE' }); + { code: 'ERR_INVALID_ARG_TYPE' }).then(common.mustCall()); assert.rejects( async () => { // eslint-disable-next-line no-unused-vars, no-empty for await (const _ of watch('', { recursive: 1 })) { } }, - { code: 'ERR_INVALID_ARG_TYPE' }); + { code: 'ERR_INVALID_ARG_TYPE' }).then(common.mustCall()); assert.rejects( async () => { // eslint-disable-next-line no-unused-vars, no-empty for await (const _ of watch('', { encoding: 1 })) { } }, - { code: 'ERR_INVALID_ARG_VALUE' }); + { code: 'ERR_INVALID_ARG_VALUE' }).then(common.mustCall()); assert.rejects( async () => { // eslint-disable-next-line no-unused-vars, no-empty for await (const _ of watch('', { signal: 1 })) { } }, - { code: 'ERR_INVALID_ARG_TYPE' }); + { code: 'ERR_INVALID_ARG_TYPE' }).then(common.mustCall()); (async () => { const ac = new AbortController(); diff --git a/test/parallel/test-fs-promises.js b/test/parallel/test-fs-promises.js index c1e61040a98e3f..383884fa62ed42 100644 --- a/test/parallel/test-fs-promises.js +++ b/test/parallel/test-fs-promises.js @@ -59,21 +59,21 @@ assert.strictEqual( name: 'Error', message: /^ENOENT: no such file or directory, access/ } - ); + ).then(common.mustCall()); assert.rejects( access(__filename, 8), { code: 'ERR_OUT_OF_RANGE', } - ); + ).then(common.mustCall()); assert.rejects( access(__filename, { [Symbol.toPrimitive]() { return 5; } }), { code: 'ERR_INVALID_ARG_TYPE', } - ); + ).then(common.mustCall()); } function verifyStatObject(stat) { @@ -407,7 +407,7 @@ async function executeOnHandle(dest, func) { const dir = path.join(tmpDir, nextdir(), nextdir()); await mkdir(path.dirname(dir)); await writeFile(dir, ''); - assert.rejects( + await assert.rejects( mkdir(dir, { recursive: true }), { code: 'EEXIST', @@ -424,7 +424,7 @@ async function executeOnHandle(dest, func) { const dir = path.join(file, nextdir(), nextdir()); await mkdir(path.dirname(file)); await writeFile(file, ''); - assert.rejects( + await assert.rejects( mkdir(dir, { recursive: true }), { code: 'ENOTDIR', @@ -463,14 +463,14 @@ async function executeOnHandle(dest, func) { code: 'ERR_INVALID_ARG_TYPE', name: 'TypeError' } - ); + ).then(common.mustCall()); }); } // `mkdtemp` with invalid numeric prefix { await mkdtemp(path.resolve(tmpDir, 'FOO')); - assert.rejects( + await assert.rejects( // mkdtemp() expects to get a string prefix. async () => mkdtemp(1), { diff --git a/test/parallel/test-fs-read-empty-buffer.js b/test/parallel/test-fs-read-empty-buffer.js index 7ec5e5c186f5eb..6abfcb5aae69c2 100644 --- a/test/parallel/test-fs-read-empty-buffer.js +++ b/test/parallel/test-fs-read-empty-buffer.js @@ -37,5 +37,5 @@ assert.throws( message: 'The argument \'buffer\' is empty and cannot be written. ' + 'Received Uint8Array(0) []' } - ); + ).then(common.mustCall()); })().then(common.mustCall()); diff --git a/test/parallel/test-stream-consumers.js b/test/parallel/test-stream-consumers.js index 4abd0f842e82bf..883d55dc6f02fb 100644 --- a/test/parallel/test-stream-consumers.js +++ b/test/parallel/test-stream-consumers.js @@ -114,7 +114,7 @@ const kArrayBuffer = writer.close(); }, 10); - assert.rejects(blob(readable), { code: 'ERR_INVALID_STATE' }); + assert.rejects(blob(readable), { code: 'ERR_INVALID_STATE' }).then(common.mustCall()); } { @@ -132,7 +132,7 @@ const kArrayBuffer = writer.close(); }, 10); - assert.rejects(arrayBuffer(readable), { code: 'ERR_INVALID_STATE' }); + assert.rejects(arrayBuffer(readable), { code: 'ERR_INVALID_STATE' }).then(common.mustCall()); } { @@ -150,7 +150,7 @@ const kArrayBuffer = writer.close(); }, 10); - assert.rejects(text(readable), { code: 'ERR_INVALID_STATE' }); + assert.rejects(text(readable), { code: 'ERR_INVALID_STATE' }).then(common.mustCall()); } { @@ -168,7 +168,7 @@ const kArrayBuffer = writer.close(); }, 10); - assert.rejects(json(readable), { code: 'ERR_INVALID_STATE' }); + assert.rejects(json(readable), { code: 'ERR_INVALID_STATE' }).then(common.mustCall()); } { @@ -227,7 +227,7 @@ const kArrayBuffer = assert.rejects(text(stream), { code: 'ERR_INVALID_ARG_TYPE', - }); + }).then(common.mustCall()); stream.write({}); stream.end({}); @@ -241,7 +241,7 @@ const kArrayBuffer = assert.rejects(json(stream), { code: 'ERR_INVALID_ARG_TYPE', - }); + }).then(common.mustCall()); stream.write({}); stream.end({}); diff --git a/test/parallel/test-stream-readable-destroy.js b/test/parallel/test-stream-readable-destroy.js index a62beb27961816..fb7da632f7b057 100644 --- a/test/parallel/test-stream-readable-destroy.js +++ b/test/parallel/test-stream-readable-destroy.js @@ -318,7 +318,7 @@ const assert = require('assert'); assert.rejects((async () => { // eslint-disable-next-line no-unused-vars, no-empty for await (const chunk of read) { } - })(), /AbortError/); + })(), /AbortError/).then(common.mustCall()); setTimeout(() => controller.abort(), 0); } diff --git a/test/parallel/test-stream-reduce.js b/test/parallel/test-stream-reduce.js index 56271c5e232627..4cee2b5d71513b 100644 --- a/test/parallel/test-stream-reduce.js +++ b/test/parallel/test-stream-reduce.js @@ -119,10 +119,10 @@ function sum(p, c) { { // Error cases - assert.rejects(() => Readable.from([]).reduce(1), /TypeError/); - assert.rejects(() => Readable.from([]).reduce('5'), /TypeError/); - assert.rejects(() => Readable.from([]).reduce((x, y) => x + y, 0, 1), /ERR_INVALID_ARG_TYPE/); - assert.rejects(() => Readable.from([]).reduce((x, y) => x + y, 0, { signal: true }), /ERR_INVALID_ARG_TYPE/); + assert.rejects(() => Readable.from([]).reduce(1), /TypeError/).then(common.mustCall()); + assert.rejects(() => Readable.from([]).reduce('5'), /TypeError/).then(common.mustCall()); + assert.rejects(() => Readable.from([]).reduce((x, y) => x + y, 0, 1), /ERR_INVALID_ARG_TYPE/).then(common.mustCall()); + assert.rejects(() => Readable.from([]).reduce((x, y) => x + y, 0, { signal: true }), /ERR_INVALID_ARG_TYPE/).then(common.mustCall()); } { diff --git a/test/parallel/test-vm-module-cached-data.js b/test/parallel/test-vm-module-cached-data.js index f91d9e62688dc5..fef68a8c18903d 100644 --- a/test/parallel/test-vm-module-cached-data.js +++ b/test/parallel/test-vm-module-cached-data.js @@ -2,7 +2,7 @@ // Flags: --experimental-vm-modules -require('../common'); +const common = require('../common'); const assert = require('assert'); const { SourceTextModule } = require('vm'); @@ -27,4 +27,4 @@ assert.rejects(async () => { m.createCachedData(); }, { code: 'ERR_VM_MODULE_CANNOT_CREATE_CACHED_DATA', -}); +}).then(common.mustCall()); diff --git a/test/parallel/test-vm-timeout-escape-promise-module.js b/test/parallel/test-vm-timeout-escape-promise-module.js index 0687b3b3c81f57..4b0169a7789db4 100644 --- a/test/parallel/test-vm-timeout-escape-promise-module.js +++ b/test/parallel/test-vm-timeout-escape-promise-module.js @@ -39,4 +39,4 @@ assert.rejects(async () => { }, { code: 'ERR_SCRIPT_EXECUTION_TIMEOUT', message: 'Script execution timed out after 5ms' -}); +}).then(common.mustCall()); diff --git a/test/parallel/test-webcrypto-export-import-cfrg.js b/test/parallel/test-webcrypto-export-import-cfrg.js index ad7e78df83e987..85a1319fa8cab4 100644 --- a/test/parallel/test-webcrypto-export-import-cfrg.js +++ b/test/parallel/test-webcrypto-export-import-cfrg.js @@ -366,11 +366,11 @@ async function testImportRaw({ name, publicUsages }) { 'spki', rsaPublic.export({ format: 'der', type: 'spki' }), { name }, - true, publicUsages), { message: /Invalid key type/ }); + true, publicUsages), { message: /Invalid key type/ }).then(common.mustCall()); assert.rejects(subtle.importKey( 'pkcs8', rsaPrivate.export({ format: 'der', type: 'pkcs8' }), { name }, - true, privateUsages), { message: /Invalid key type/ }); + true, privateUsages), { message: /Invalid key type/ }).then(common.mustCall()); } } diff --git a/test/parallel/test-webcrypto-export-import-rsa.js b/test/parallel/test-webcrypto-export-import-rsa.js index c18abf9832f365..fb79184afd6e12 100644 --- a/test/parallel/test-webcrypto-export-import-rsa.js +++ b/test/parallel/test-webcrypto-export-import-rsa.js @@ -565,11 +565,11 @@ const testVectors = [ 'spki', ecPublic.export({ format: 'der', type: 'spki' }), { name, hash: 'SHA-256' }, - true, [publicUsage]), { message: /Invalid key type/ }); + true, [publicUsage]), { message: /Invalid key type/ }).then(common.mustCall()); assert.rejects(subtle.importKey( 'pkcs8', ecPrivate.export({ format: 'der', type: 'pkcs8' }), { name, hash: 'SHA-256' }, - true, [privateUsage]), { message: /Invalid key type/ }); + true, [privateUsage]), { message: /Invalid key type/ }).then(common.mustCall()); } } diff --git a/test/parallel/test-webstream-readablestream-pipeto.js b/test/parallel/test-webstream-readablestream-pipeto.js index 95929c5197a275..ef952e30c0867d 100644 --- a/test/parallel/test-webstream-readablestream-pipeto.js +++ b/test/parallel/test-webstream-readablestream-pipeto.js @@ -1,7 +1,7 @@ // Flags: --expose-internals 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('node:assert'); const { AbortError } = require('internal/errors'); @@ -20,5 +20,5 @@ for (const message of [undefined, 'abc']) { assert.strictEqual(e.name, 'AbortError'); assert.strictEqual(e.message, reason.message); return true; - }); + }).then(common.mustCall()); } diff --git a/test/parallel/test-whatwg-readablebytestream.js b/test/parallel/test-whatwg-readablebytestream.js index 6b305a0d8365f2..a1a4a757d8bb1e 100644 --- a/test/parallel/test-whatwg-readablebytestream.js +++ b/test/parallel/test-whatwg-readablebytestream.js @@ -184,7 +184,7 @@ class Source { throw error; } - assert.rejects(read(stream), error); + assert.rejects(read(stream), error).then(common.mustCall()); } { @@ -212,10 +212,10 @@ class Source { reader.releaseLock(); assert.rejects(reader.read(new Uint8Array(10)), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); assert.rejects(reader.cancel(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); } { diff --git a/test/parallel/test-whatwg-readablestream.js b/test/parallel/test-whatwg-readablestream.js index 974b7791a6d68a..db48facddab906 100644 --- a/test/parallel/test-whatwg-readablestream.js +++ b/test/parallel/test-whatwg-readablestream.js @@ -355,11 +355,11 @@ assert.throws(() => { assert.rejects(reader.read(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); assert.rejects(closedBefore, { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); } { @@ -391,7 +391,7 @@ assert.throws(() => { assert.rejects(stream.cancel(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); reader.cancel(); @@ -483,7 +483,7 @@ assert.throws(() => { closedBefore.then(common.mustCall()); assert.rejects(closedAfter, { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); } { @@ -505,7 +505,7 @@ assert.throws(() => { closedBefore.then(common.mustCall()); assert.rejects(closedAfter, { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); } { @@ -579,9 +579,9 @@ assert.throws(() => { }); stream.getReader().releaseLock(); const reader = stream.getReader(); - assert.rejects(reader.closed, error); - assert.rejects(reader.read(), error); - assert.rejects(reader.read(), error); + assert.rejects(reader.closed, error).then(common.mustCall()); + assert.rejects(reader.read(), error).then(common.mustCall()); + assert.rejects(reader.read(), error).then(common.mustCall()); } { @@ -595,8 +595,8 @@ assert.throws(() => { const cancel1 = reader.cancel(); const cancel2 = reader.cancel(); assert.notStrictEqual(cancel1, cancel2); - assert.rejects(cancel1, error); - assert.rejects(cancel2, error); + assert.rejects(cancel1, error).then(common.mustCall()); + assert.rejects(cancel2, error).then(common.mustCall()); } { @@ -608,9 +608,9 @@ assert.throws(() => { }); stream.getReader().releaseLock(); const reader = stream.getReader(); - assert.rejects(reader.closed, error); - assert.rejects(reader.read(), error); - assert.rejects(reader.read(), error); + assert.rejects(reader.closed, error).then(common.mustCall()); + assert.rejects(reader.read(), error).then(common.mustCall()); + assert.rejects(reader.read(), error).then(common.mustCall()); } { @@ -717,8 +717,10 @@ assert.throws(() => { assert.notStrictEqual(closed1, closed2); - assert.rejects(closed1, error); - assert.rejects(closed2, error); + assert.rejects(closed1, error).then(common.mustCall()); + assert.rejects(closed2, error).then(common.mustCall()); + + reader1.read(); } { @@ -796,8 +798,8 @@ assert.throws(() => { const { 0: s1, 1: s2 } = stream.tee(); - assert.rejects(s1.cancel(), error); - assert.rejects(s2.cancel(), error); + assert.rejects(s1.cancel(), error).then(common.mustCall()); + assert.rejects(s2.cancel(), error).then(common.mustCall()); } { @@ -812,8 +814,8 @@ assert.throws(() => { const { 0: s1, 1: s2 } = stream.tee(); c.error(error); - assert.rejects(s1.cancel(), error); - assert.rejects(s2.cancel(), error); + assert.rejects(s1.cancel(), error).then(common.mustCall()); + assert.rejects(s2.cancel(), error).then(common.mustCall()); } { @@ -830,11 +832,11 @@ assert.throws(() => { const reader1 = s1.getReader(); const reader2 = s2.getReader(); - assert.rejects(reader1.closed, error); - assert.rejects(reader2.closed, error); + assert.rejects(reader1.closed, error).then(common.mustCall()); + assert.rejects(reader2.closed, error).then(common.mustCall()); - assert.rejects(reader1.read(), error); - assert.rejects(reader2.read(), error); + assert.rejects(reader1.read(), error).then(common.mustCall()); + assert.rejects(reader2.read(), error).then(common.mustCall()); setImmediate(() => c.error(error)); } @@ -1038,7 +1040,7 @@ assert.throws(() => { const reader = stream.getReader(); - assert.rejects(reader.closed, error); + assert.rejects(reader.closed, error).then(common.mustCall()); } { @@ -1053,7 +1055,7 @@ assert.throws(() => { const reader = stream.getReader(); - assert.rejects(reader.closed, error); + assert.rejects(reader.closed, error).then(common.mustCall()); } { @@ -1357,7 +1359,7 @@ class Source { }); assert.rejects(() => ReadableStream.prototype.cancel.call({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.throws(() => ReadableStream.prototype.getReader.call({}), { code: 'ERR_INVALID_THIS', }); @@ -1372,15 +1374,15 @@ class Source { }); assert.rejects(() => ReadableStreamDefaultReader.prototype.read.call({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.rejects(() => ReadableStreamDefaultReader.prototype.cancel.call({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.rejects(() => { return Reflect.get(ReadableStreamDefaultReader.prototype, 'closed'); }, { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.throws(() => { ReadableStreamDefaultReader.prototype.releaseLock.call({}); }, { @@ -1388,7 +1390,7 @@ class Source { }); assert.rejects(() => ReadableStreamBYOBReader.prototype.read.call({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.throws(() => { ReadableStreamBYOBReader.prototype.releaseLock.call({}); }, { @@ -1398,10 +1400,10 @@ class Source { return Reflect.get(ReadableStreamBYOBReader.prototype, 'closed'); }, { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.rejects(() => ReadableStreamBYOBReader.prototype.cancel.call({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.throws(() => { Reflect.get(ReadableByteStreamController.prototype, 'byobRequest', {}); @@ -1484,11 +1486,11 @@ class Source { assert.rejects(readableStreamPipeTo(1), { code: 'ERR_INVALID_ARG_TYPE', - }); + }).then(common.mustCall()); assert.rejects(readableStreamPipeTo(new ReadableStream(), 1), { code: 'ERR_INVALID_ARG_TYPE', - }); + }).then(common.mustCall()); assert.rejects( readableStreamPipeTo( @@ -1500,7 +1502,7 @@ class Source { {}), { code: 'ERR_INVALID_ARG_TYPE', - }); + }).then(common.mustCall()); } { @@ -1510,10 +1512,10 @@ class Source { reader.releaseLock(); assert.rejects(reader.read(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); assert.rejects(reader.cancel(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); } { diff --git a/test/parallel/test-whatwg-webstreams-adapters-to-readablestream.js b/test/parallel/test-whatwg-webstreams-adapters-to-readablestream.js index 433552388ac7a0..66af7b128c4d5a 100644 --- a/test/parallel/test-whatwg-webstreams-adapters-to-readablestream.js +++ b/test/parallel/test-whatwg-webstreams-adapters-to-readablestream.js @@ -60,7 +60,7 @@ const { assert.rejects(reader.closed, { code: 'ABORT_ERR', - }); + }).then(common.mustCall()); readable.on('end', common.mustNotCall()); readable.on('error', common.mustNotCall()); @@ -116,7 +116,7 @@ const { const reader = readableStream.getReader(); - assert.rejects(reader.closed, error); + assert.rejects(reader.closed, error).then(common.mustCall()); readable.on('end', common.mustNotCall()); readable.on('error', common.mustCall((reason) => { diff --git a/test/parallel/test-whatwg-webstreams-adapters-to-readablewritablepair.js b/test/parallel/test-whatwg-webstreams-adapters-to-readablewritablepair.js index a4ce9d163214cd..83d21247a49265 100644 --- a/test/parallel/test-whatwg-webstreams-adapters-to-readablewritablepair.js +++ b/test/parallel/test-whatwg-webstreams-adapters-to-readablewritablepair.js @@ -28,11 +28,11 @@ const { assert.rejects(reader.closed, { code: 'ABORT_ERR', - }); + }).then(common.mustCall()); assert.rejects(writer.closed, { code: 'ABORT_ERR', - }); + }).then(common.mustCall()); duplex.destroy(); @@ -58,8 +58,8 @@ const { const reader = readable.getReader(); const writer = writable.getWriter(); - assert.rejects(reader.closed, error); - assert.rejects(writer.closed, error); + assert.rejects(reader.closed, error).then(common.mustCall()); + assert.rejects(writer.closed, error).then(common.mustCall()); duplex.destroy(error); } @@ -81,7 +81,7 @@ const { const writer = writable.getWriter(); reader.closed.then(common.mustCall()); - assert.rejects(writer.closed, error); + assert.rejects(writer.closed, error).then(common.mustCall()); reader.cancel(error).then(common.mustCall()); } @@ -121,8 +121,8 @@ const { const reader = readable.getReader(); const writer = writable.getWriter(); - assert.rejects(reader.closed, error); - assert.rejects(writer.closed, error); + assert.rejects(reader.closed, error).then(common.mustCall()); + assert.rejects(writer.closed, error).then(common.mustCall()); writer.abort(error).then(common.mustCall()); } @@ -145,7 +145,7 @@ const { assert.rejects(writer.closed, { code: 'ABORT_ERR', - }); + }).then(common.mustCall()); reader.cancel(); } @@ -166,7 +166,7 @@ const { reader.closed.then(common.mustCall()); assert.rejects(writer.closed, { code: 'ABORT_ERR', - }); + }).then(common.mustCall()); duplex.end(); } diff --git a/test/parallel/test-whatwg-webstreams-adapters-to-streamreadable.js b/test/parallel/test-whatwg-webstreams-adapters-to-streamreadable.js index 5e5eb7c4817ac0..45f45023fa028b 100644 --- a/test/parallel/test-whatwg-webstreams-adapters-to-streamreadable.js +++ b/test/parallel/test-whatwg-webstreams-adapters-to-streamreadable.js @@ -56,10 +56,10 @@ class MySource { assert.rejects(readableStream.cancel(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); assert.rejects(readableStream.pipeTo(new WritableStream()), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); assert.throws(() => readableStream.tee(), { code: 'ERR_INVALID_STATE', }); diff --git a/test/parallel/test-whatwg-webstreams-adapters-to-streamwritable.js b/test/parallel/test-whatwg-webstreams-adapters-to-streamwritable.js index 495eef73f79272..b3415cdf18d42a 100644 --- a/test/parallel/test-whatwg-webstreams-adapters-to-streamwritable.js +++ b/test/parallel/test-whatwg-webstreams-adapters-to-streamwritable.js @@ -125,11 +125,11 @@ class TestSource { assert.rejects(writableStream.close(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); assert.rejects(writableStream.abort(), { code: 'ERR_INVALID_STATE', - }); + }).then(common.mustCall()); assert.throws(() => writableStream.getWriter(), { code: 'ERR_INVALID_STATE', diff --git a/test/parallel/test-whatwg-webstreams-adapters-to-writablestream.js b/test/parallel/test-whatwg-webstreams-adapters-to-writablestream.js index 4457ad39f8cb6d..1527610c513333 100644 --- a/test/parallel/test-whatwg-webstreams-adapters-to-writablestream.js +++ b/test/parallel/test-whatwg-webstreams-adapters-to-writablestream.js @@ -81,7 +81,7 @@ class TestWritable extends Writable { const writable = new TestWritable(); const writableStream = newWritableStreamFromStreamWritable(writable); - assert.rejects(writableStream.close(), error); + assert.rejects(writableStream.close(), error).then(common.mustCall()); writable.destroy(error); } @@ -93,7 +93,7 @@ class TestWritable extends Writable { assert.rejects(writableStream.close(), { code: 'ABORT_ERR' - }); + }).then(common.mustCall()); writable.end(); } diff --git a/test/parallel/test-whatwg-webstreams-transfer.js b/test/parallel/test-whatwg-webstreams-transfer.js index 31e45858da52eb..01cfaa02ad075e 100644 --- a/test/parallel/test-whatwg-webstreams-transfer.js +++ b/test/parallel/test-whatwg-webstreams-transfer.js @@ -326,7 +326,7 @@ const theData = 'hello'; assert.rejects(reader.read(), { code: 25, name: 'DataCloneError', - }); + }).then(common.mustCall()); port1.close(); }; @@ -377,7 +377,7 @@ const theData = 'hello'; assert.rejects(writer.closed, { code: 25, name: 'DataCloneError', - }); + }).then(common.mustCall()); writer.write(notActuallyTransferable).then(common.mustCall()); @@ -407,7 +407,7 @@ const theData = 'hello'; port1.onmessage = common.mustCall(({ data }) => { const writer = data.getWriter(); - assert.rejects(writer.closed, error); + assert.rejects(writer.closed, error).then(common.mustCall()); writer.abort(error).then(common.mustCall()); port1.close(); @@ -438,7 +438,7 @@ const theData = 'hello'; assert.rejects(writer.abort(m), { code: 25, name: 'DataCloneError', - }); + }).then(common.mustCall()); port1.close(); }); @@ -531,7 +531,7 @@ const theData = 'hello'; assert.rejects(cancel, { code: 25, name: 'DataCloneError', - }); + }).then(common.mustCall()); port1.close(); }); @@ -557,7 +557,7 @@ const theData = 'hello'; const m = new WebAssembly.Memory({ initial: 1 }); const writer = data.getWriter(); const write = writer.write(m); - assert.rejects(write, { code: 25, name: 'DataCloneError' }); + assert.rejects(write, { code: 25, name: 'DataCloneError' }).then(common.mustCall()); port1.close(); }); diff --git a/test/parallel/test-whatwg-writablestream.js b/test/parallel/test-whatwg-writablestream.js index fde08c7dd1cd9c..7d1d686358c0e1 100644 --- a/test/parallel/test-whatwg-writablestream.js +++ b/test/parallel/test-whatwg-writablestream.js @@ -129,7 +129,7 @@ class Sink { const writer = stream.getWriter(); - assert.rejects(writer.closed, error); + assert.rejects(writer.closed, error).then(common.mustCall()); writer.abort(error).then(common.mustCall(() => { assert.strictEqual(stream[kState].state, 'errored'); @@ -163,10 +163,10 @@ class Sink { }); assert.rejects(() => WritableStream.prototype.abort({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.rejects(() => WritableStream.prototype.close({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.throws(() => WritableStream.prototype.getWriter.call(), { code: 'ERR_INVALID_THIS', }); @@ -176,24 +176,24 @@ class Sink { assert.rejects( Reflect.get(WritableStreamDefaultWriter.prototype, 'closed'), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.rejects( Reflect.get(WritableStreamDefaultWriter.prototype, 'ready'), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.throws( () => Reflect.get(WritableStreamDefaultWriter.prototype, 'desiredSize'), { code: 'ERR_INVALID_THIS', }); assert.rejects(WritableStreamDefaultWriter.prototype.abort({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.rejects(WritableStreamDefaultWriter.prototype.close({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.rejects(WritableStreamDefaultWriter.prototype.write({}), { code: 'ERR_INVALID_THIS', - }); + }).then(common.mustCall()); assert.throws(() => WritableStreamDefaultWriter.prototype.releaseLock({}), { code: 'ERR_INVALID_THIS', }); diff --git a/test/parallel/test-worker-message-port-transfer-filehandle.js b/test/parallel/test-worker-message-port-transfer-filehandle.js index 8e3082240cd2c7..3e6afe22a8c636 100644 --- a/test/parallel/test-worker-message-port-transfer-filehandle.js +++ b/test/parallel/test-worker-message-port-transfer-filehandle.js @@ -30,7 +30,7 @@ const { once } = require('events'); assert.deepStrictEqual(await fh2.readFile(), await fs.readFile(__filename)); await fh2.close(); - assert.rejects(() => fh.readFile(), { code: 'EBADF' }); + await assert.rejects(() => fh.readFile(), { code: 'EBADF' }); })().then(common.mustCall()); (async function() { diff --git a/test/sequential/test-vm-timeout-escape-promise-module-2.js b/test/sequential/test-vm-timeout-escape-promise-module-2.js index 6a9d09890ddef0..13aa2fe998655d 100644 --- a/test/sequential/test-vm-timeout-escape-promise-module-2.js +++ b/test/sequential/test-vm-timeout-escape-promise-module-2.js @@ -39,4 +39,4 @@ assert.rejects(async () => { }, { code: 'ERR_SCRIPT_EXECUTION_TIMEOUT', message: 'Script execution timed out after 10ms' -}); +}).then(common.mustCall()); diff --git a/test/wasi/test-wasi-not-started.js b/test/wasi/test-wasi-not-started.js index b6c1b538ef96cc..2ef10418ae40ad 100644 --- a/test/wasi/test-wasi-not-started.js +++ b/test/wasi/test-wasi-not-started.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +const common = require('../common'); if (process.argv[2] === 'wasi-child') { const assert = require('assert'); @@ -23,7 +23,7 @@ if (process.argv[2] === 'wasi-child') { name: 'Error', code: 'ERR_WASI_NOT_STARTED', message: 'wasi.start() has not been called', - }); + }).then(common.mustCall()); } else { const assert = require('assert'); const cp = require('child_process');