From 30fb4a015db2226aabaed457ec8930c9f9b8fd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Sun, 6 Sep 2020 22:27:07 +0200
Subject: [PATCH] test: add common.mustSucceed
PR-URL: https://github.com/nodejs/node/pull/35086
Reviewed-By: Ruy Adorno <ruyadorno@github.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
doc/guides/writing-tests.md | 5 ++
test/.eslintrc.yaml | 1 +
test/common/README.md | 9 +++
test/common/index.js | 9 +++
test/doctool/test-doctool-json.js | 6 +-
test/internet/test-dns-any.js | 9 +--
test/internet/test-dns-ipv4.js | 30 +++-----
test/internet/test-dns-ipv6.js | 18 ++---
test/internet/test-http2-issue-32922.js | 13 +---
test/parallel/test-c-ares.js | 12 ++--
...t-child-process-exec-any-shells-windows.js | 11 ++-
test/parallel/test-child-process-exec-cwd.js | 3 +-
.../test-child-process-exec-encoding.js | 3 +-
.../test-child-process-exec-maxbuf.js | 9 +--
.../test-child-process-exec-std-encoding.js | 3 +-
.../test-child-process-exec-timeout.js | 3 +-
.../test-child-process-execfile-maxbuf.js | 6 +-
test/parallel/test-child-process-execfile.js | 4 +-
.../test-child-process-fork-getconnections.js | 3 +-
.../test-child-process-send-keep-open.js | 4 +-
.../test-child-process-windows-hide.js | 3 +-
test/parallel/test-cli-eval.js | 48 +++++--------
test/parallel/test-cli-node-print-help.js | 3 +-
test/parallel/test-cluster-http-pipe.js | 3 +-
...test-cluster-worker-disconnect-on-error.js | 3 +-
test/parallel/test-crypto-hkdf.js | 18 ++---
test/parallel/test-crypto-keygen.js | 70 +++++--------------
test/parallel/test-crypto-pbkdf2.js | 35 +++++-----
test/parallel/test-crypto-random.js | 39 ++++-------
test/parallel/test-crypto-scrypt.js | 12 ++--
test/parallel/test-crypto-secret-keygen.js | 9 +--
...ram-connect-send-callback-buffer-length.js | 3 +-
...test-dgram-connect-send-callback-buffer.js | 3 +-
.../test-dgram-connect-send-empty-buffer.js | 2 +-
...st-dgram-connect-send-multi-buffer-copy.js | 3 +-
.../parallel/test-dgram-send-address-types.js | 3 +-
...gram-send-callback-buffer-empty-address.js | 3 +-
...nd-callback-buffer-length-empty-address.js | 3 +-
.../test-dgram-send-callback-buffer-length.js | 3 +-
.../test-dgram-send-callback-buffer.js | 3 +-
...end-callback-multi-buffer-empty-address.js | 3 +-
test/parallel/test-dns-lookup.js | 9 +--
test/parallel/test-dns-multi-channel.js | 3 +-
test/parallel/test-dns-resolveany.js | 3 +-
test/parallel/test-dns.js | 3 +-
test/parallel/test-domain-crypto.js | 6 +-
.../test-eslint-prefer-common-mustsucceed.js | 52 ++++++++++++++
test/parallel/test-fs-append-file.js | 36 +++-------
test/parallel/test-fs-buffer.js | 13 ++--
test/parallel/test-fs-chmod-mask.js | 13 ++--
test/parallel/test-fs-chmod.js | 16 ++---
test/parallel/test-fs-copyfile.js | 3 +-
test/parallel/test-fs-empty-readStream.js | 10 +--
test/parallel/test-fs-existssync-false.js | 4 +-
test/parallel/test-fs-fsync.js | 10 +--
test/parallel/test-fs-lchown.js | 3 +-
test/parallel/test-fs-long-path.js | 9 +--
test/parallel/test-fs-mkdir-mode-mask.js | 3 +-
test/parallel/test-fs-mkdir-rmdir.js | 4 +-
test/parallel/test-fs-open-flags.js | 3 +-
test/parallel/test-fs-open-mode-mask.js | 3 +-
test/parallel/test-fs-open.js | 20 ++----
test/parallel/test-fs-opendir.js | 7 +-
test/parallel/test-fs-read.js | 6 +-
test/parallel/test-fs-readdir-types.js | 6 +-
test/parallel/test-fs-readdir-ucs2.js | 3 +-
test/parallel/test-fs-readdir.js | 3 +-
test/parallel/test-fs-readfile-fd.js | 9 +--
test/parallel/test-fs-readfile-pipe-large.js | 3 +-
test/parallel/test-fs-readfile-pipe.js | 6 +-
test/parallel/test-fs-readfile-unlink.js | 3 +-
test/parallel/test-fs-readfilesync-enoent.js | 3 +-
.../test-fs-readfilesync-pipe-large.js | 3 +-
test/parallel/test-fs-readv.js | 4 +-
.../test-fs-realpath-buffer-encoding.js | 24 +++----
test/parallel/test-fs-realpath-native.js | 3 +-
.../test-fs-realpath-on-substed-drive.js | 6 +-
test/parallel/test-fs-realpath.js | 3 +-
test/parallel/test-fs-rm.js | 3 +-
test/parallel/test-fs-rmdir-recursive.js | 8 +--
test/parallel/test-fs-stat.js | 17 ++---
test/parallel/test-fs-symlink-buffer-path.js | 9 +--
.../test-fs-symlink-dir-junction-relative.js | 3 +-
test/parallel/test-fs-symlink-dir-junction.js | 20 ++----
test/parallel/test-fs-symlink-dir.js | 6 +-
test/parallel/test-fs-symlink-longpath.js | 6 +-
test/parallel/test-fs-symlink.js | 17 ++---
.../test-fs-truncate-clear-file-zero.js | 3 +-
test/parallel/test-fs-truncate-fd.js | 3 +-
test/parallel/test-fs-truncate.js | 20 ++----
test/parallel/test-fs-whatwg-url.js | 3 +-
test/parallel/test-fs-write-buffer.js | 52 ++++----------
.../test-fs-write-file-typedarrays.js | 7 +-
test/parallel/test-fs-write-file.js | 31 +++-----
test/parallel/test-fs-write-reuse-callback.js | 3 +-
test/parallel/test-fs-write.js | 34 +++------
test/parallel/test-fs-writefile-with-fd.js | 11 +--
test/parallel/test-fs-writev.js | 8 +--
test/parallel/test-http-outgoing-finish.js | 2 +-
.../test-http-unix-socket-keep-alive.js | 3 +-
test/parallel/test-http2-buffersize.js | 4 +-
.../test-http2-client-upload-reject.js | 4 +-
test/parallel/test-http2-client-upload.js | 3 +-
.../test-http2-compat-client-upload-reject.js | 4 +-
...ompat-serverresponse-createpushresponse.js | 3 +-
...test-http2-create-client-secure-session.js | 2 +-
test/parallel/test-http2-dont-lose-data.js | 3 +-
...test-http2-options-max-reserved-streams.js | 6 +-
...st-http2-respond-file-error-pipe-offset.js | 2 +-
.../test-http2-respond-file-with-pipe.js | 3 +-
.../test-http2-server-close-callback.js | 2 +-
.../parallel/test-http2-server-push-stream.js | 3 +-
test/parallel/test-https-close.js | 2 +-
test/parallel/test-inspector-heapdump.js | 3 +-
test/parallel/test-intl.js | 4 +-
test/parallel/test-net-pingpong.js | 3 +-
test/parallel/test-pipe-file-to-http.js | 4 +-
test/parallel/test-pipe-head.js | 3 +-
test/parallel/test-preload.js | 9 +--
.../test-process-redirect-warnings-env.js | 3 +-
.../test-process-redirect-warnings.js | 3 +-
test/parallel/test-quic-client-server.js | 8 +--
...st-quic-quicsocket-packetloss-stream-rx.js | 4 +-
...st-quic-quicsocket-packetloss-stream-tx.js | 4 +-
.../test-quic-quicstream-close-early.js | 6 +-
.../test-quic-simple-client-migrate.js | 2 +-
test/parallel/test-repl-history-perm.js | 4 +-
test/parallel/test-repl-save-load.js | 6 +-
test/parallel/test-repl-tab-complete.js | 9 +--
test/parallel/test-repl-use-global.js | 6 +-
test/parallel/test-setproctitle.js | 3 +-
test/parallel/test-stdout-to-file.js | 3 +-
test/parallel/test-stream-finished.js | 15 ++--
test/parallel/test-stream-pipeline-process.js | 7 +-
.../parallel/test-stream-pipeline-uncaught.js | 3 +-
test/parallel/test-stream-pipeline.js | 53 +++++---------
test/parallel/test-tls-addca.js | 3 +-
test/parallel/test-tls-ca-concat.js | 5 +-
test/parallel/test-tls-cert-chains-concat.js | 4 +-
.../test-tls-client-getephemeralkeyinfo.js | 4 +-
.../test-tls-disable-renegotiation.js | 3 +-
test/parallel/test-tls-ecdh.js | 3 +-
test/parallel/test-trace-events-api.js | 3 +-
test/parallel/test-util-callbackify.js | 24 +++----
...test-worker-no-stdin-stdout-interaction.js | 2 +-
.../test-zlib-from-concatenated-gzip.js | 9 +--
...st-zlib-from-gzip-with-trailing-garbage.js | 3 +-
test/sequential/test-init.js | 3 +-
.../eslint-rules/prefer-common-mustsucceed.js | 66 +++++++++++++++++
149 files changed, 532 insertions(+), 826 deletions(-)
create mode 100644 test/parallel/test-eslint-prefer-common-mustsucceed.js
create mode 100644 tools/eslint-rules/prefer-common-mustsucceed.js
diff --git a/doc/guides/writing-tests.md b/doc/guides/writing-tests.md
index b7d92709444678..a2d436def23940 100644
--- a/doc/guides/writing-tests.md
+++ b/doc/guides/writing-tests.md
@@ -209,6 +209,11 @@ const server = http.createServer(common.mustCall((req, res) => {
```
+**Note:** Many functions invoke their callback with an `err` value as the first
+argument. It is not a good idea to simply pass `common.mustCall()` to those
+because `common.mustCall()` will ignore the error. Use `common.mustSucceed()`
+instead.
+
#### Countdown Module
The common [Countdown module](https://github.com/nodejs/node/tree/master/test/common#countdown-module)
diff --git a/test/.eslintrc.yaml b/test/.eslintrc.yaml
index 5872844db40914..6a0104f7ce17ca 100644
--- a/test/.eslintrc.yaml
+++ b/test/.eslintrc.yaml
@@ -50,6 +50,7 @@ rules:
node-core/prefer-assert-iferror: error
node-core/prefer-assert-methods: error
node-core/prefer-common-mustnotcall: error
+ node-core/prefer-common-mustsucceed: error
node-core/crypto-check: error
node-core/eslint-check: error
node-core/async-iife-no-unused-result: error
diff --git a/test/common/README.md b/test/common/README.md
index 24dda01a980d2c..31d37d7abd2b4a 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -314,6 +314,15 @@ If `fn` is not provided, an empty function will be used.
Returns a function that triggers an `AssertionError` if it is invoked. `msg` is
used as the error message for the `AssertionError`.
+### `mustSucceed([fn])`
+
+* `fn` [<Function>][] default = () => {}
+* return [<Function>][]
+
+Returns a function that accepts arguments `(err, ...args)`. If `err` is not
+`undefined` or `null`, it triggers an `AssertionError`. Otherwise, it calls
+`fn(...args)`.
+
### `nodeProcessAborted(exitCode, signal)`
* `exitCode` [<number>][]
diff --git a/test/common/index.js b/test/common/index.js
index 35122e607ed991..b75c5441d2e3d5 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -335,6 +335,14 @@ function mustCall(fn, exact) {
return _mustCallInner(fn, exact, 'exact');
}
+function mustSucceed(fn, exact) {
+ return mustCall(function(err, ...args) {
+ assert.ifError(err);
+ if (typeof fn === 'function')
+ return fn.apply(this, args);
+ }, exact);
+}
+
function mustCallAtLeast(fn, minimum) {
return _mustCallInner(fn, minimum, 'minimum');
}
@@ -722,6 +730,7 @@ const common = {
mustCall,
mustCallAtLeast,
mustNotCall,
+ mustSucceed,
nodeProcessAborted,
PIPE,
platformTimeout,
diff --git a/test/doctool/test-doctool-json.js b/test/doctool/test-doctool-json.js
index 36d76cfec8236b..2767b48ef2104b 100644
--- a/test/doctool/test-doctool-json.js
+++ b/test/doctool/test-doctool-json.js
@@ -229,10 +229,8 @@ const testData = [
];
testData.forEach((item) => {
- fs.readFile(item.file, 'utf8', common.mustCall((err, input) => {
- assert.ifError(err);
- toJSON(input, 'foo', common.mustCall((err, output) => {
- assert.ifError(err);
+ fs.readFile(item.file, 'utf8', common.mustSucceed((input) => {
+ toJSON(input, 'foo', common.mustSucceed((output) => {
assert.deepStrictEqual(output.json, item.json);
}));
}));
diff --git a/test/internet/test-dns-any.js b/test/internet/test-dns-any.js
index d60f00f09804a7..e721d0f99dcfd7 100644
--- a/test/internet/test-dns-any.js
+++ b/test/internet/test-dns-any.js
@@ -127,8 +127,7 @@ TEST(async function test_sip2sip_for_naptr(done) {
const req = dns.resolve(
'sip2sip.info',
'ANY',
- common.mustCall(function(err, ret) {
- assert.ifError(err);
+ common.mustSucceed((ret) => {
validateResult(ret);
done();
}));
@@ -147,8 +146,7 @@ TEST(async function test_google_for_cname_and_srv(done) {
const req = dns.resolve(
'_jabber._tcp.google.com',
'ANY',
- common.mustCall(function(err, ret) {
- assert.ifError(err);
+ common.mustSucceed((ret) => {
validateResult(ret);
done();
}));
@@ -167,8 +165,7 @@ TEST(async function test_ptr(done) {
const req = dns.resolve(
'8.8.8.8.in-addr.arpa',
'ANY',
- common.mustCall(function(err, ret) {
- assert.ifError(err);
+ common.mustSucceed((ret) => {
validateResult(ret);
done();
}));
diff --git a/test/internet/test-dns-ipv4.js b/test/internet/test-dns-ipv4.js
index 1179cd6f5d6c7f..a84f7e644fc9cf 100644
--- a/test/internet/test-dns-ipv4.js
+++ b/test/internet/test-dns-ipv4.js
@@ -50,8 +50,7 @@ TEST(async function test_resolve4(done) {
const req = dns.resolve4(
addresses.INET4_HOST,
- common.mustCall((err, ips) => {
- assert.ifError(err);
+ common.mustSucceed((ips) => {
validateResult(ips);
done();
}));
@@ -73,8 +72,7 @@ TEST(async function test_reverse_ipv4(done) {
const req = dns.reverse(
addresses.INET4_IP,
- common.mustCall((err, domains) => {
- assert.ifError(err);
+ common.mustSucceed((domains) => {
validateResult(domains);
done();
}));
@@ -92,8 +90,7 @@ TEST(async function test_lookup_ipv4_explicit(done) {
const req = dns.lookup(
addresses.INET4_HOST, 4,
- common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -111,8 +108,7 @@ TEST(async function test_lookup_ipv4_implicit(done) {
const req = dns.lookup(
addresses.INET4_HOST,
- common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -130,8 +126,7 @@ TEST(async function test_lookup_ipv4_explicit_object(done) {
const req = dns.lookup(addresses.INET4_HOST, {
family: 4
- }, common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ }, common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -151,8 +146,7 @@ TEST(async function test_lookup_ipv4_hint_addrconfig(done) {
const req = dns.lookup(addresses.INET4_HOST, {
hints: dns.ADDRCONFIG
- }, common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ }, common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -169,8 +163,7 @@ TEST(async function test_lookup_ip_ipv4(done) {
validateResult(await dnsPromises.lookup('127.0.0.1'));
const req = dns.lookup('127.0.0.1',
- common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -187,8 +180,7 @@ TEST(async function test_lookup_localhost_ipv4(done) {
validateResult(await dnsPromises.lookup('localhost', 4));
const req = dns.lookup('localhost', 4,
- common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -215,8 +207,7 @@ TEST(async function test_lookup_all_ipv4(done) {
const req = dns.lookup(
addresses.INET4_HOST,
{ all: true, family: 4 },
- common.mustCall((err, ips) => {
- assert.ifError(err);
+ common.mustSucceed((ips) => {
validateResult(ips);
done();
})
@@ -236,8 +227,7 @@ TEST(async function test_lookupservice_ip_ipv4(done) {
const req = dns.lookupService(
'127.0.0.1', 80,
- common.mustCall((err, hostname, service) => {
- assert.ifError(err);
+ common.mustSucceed((hostname, service) => {
validateResult({ hostname, service });
done();
})
diff --git a/test/internet/test-dns-ipv6.js b/test/internet/test-dns-ipv6.js
index ed75c1753ca60c..6f499b68947322 100644
--- a/test/internet/test-dns-ipv6.js
+++ b/test/internet/test-dns-ipv6.js
@@ -52,8 +52,7 @@ TEST(async function test_resolve6(done) {
const req = dns.resolve6(
addresses.INET6_HOST,
- common.mustCall((err, ips) => {
- assert.ifError(err);
+ common.mustSucceed((ips) => {
validateResult(ips);
done();
}));
@@ -74,8 +73,7 @@ TEST(async function test_reverse_ipv6(done) {
const req = dns.reverse(
addresses.INET6_IP,
- common.mustCall((err, domains) => {
- assert.ifError(err);
+ common.mustSucceed((domains) => {
validateResult(domains);
done();
}));
@@ -94,8 +92,7 @@ TEST(async function test_lookup_ipv6_explicit(done) {
const req = dns.lookup(
addresses.INET6_HOST,
6,
- common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -126,8 +123,7 @@ TEST(async function test_lookup_ipv6_explicit_object(done) {
const req = dns.lookup(addresses.INET6_HOST, {
family: 6
- }, common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ }, common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -173,8 +169,7 @@ TEST(async function test_lookup_ip_ipv6(done) {
const req = dns.lookup(
'::1',
- common.mustCall((err, ip, family) => {
- assert.ifError(err);
+ common.mustSucceed((ip, family) => {
validateResult({ address: ip, family });
done();
}));
@@ -202,8 +197,7 @@ TEST(async function test_lookup_all_ipv6(done) {
const req = dns.lookup(
addresses.INET6_HOST,
{ all: true, family: 6 },
- common.mustCall((err, ips) => {
- assert.ifError(err);
+ common.mustSucceed((ips) => {
validateResult(ips);
done();
})
diff --git a/test/internet/test-http2-issue-32922.js b/test/internet/test-http2-issue-32922.js
index e11de0286eb7a4..d4efc27060dda0 100644
--- a/test/internet/test-http2-issue-32922.js
+++ b/test/internet/test-http2-issue-32922.js
@@ -1,6 +1,5 @@
'use strict';
const common = require('../common');
-const assert = require('assert');
if (!common.hasCrypto)
common.skip('missing crypto');
@@ -29,9 +28,7 @@ function normalSession(cb) {
});
});
}
-normalSession(common.mustCall(function(err) {
- assert.ifError(err);
-}));
+normalSession(common.mustSucceed());
// Create a session using a socket that has not yet finished connecting
function socketNotFinished(done) {
@@ -52,9 +49,7 @@ function socketNotFinished(done) {
});
});
}
-socketNotFinished(common.mustCall(function(err) {
- assert.ifError(err);
-}));
+socketNotFinished(common.mustSucceed());
// Create a session using a socket that has finished connecting
function socketFinished(done) {
@@ -75,6 +70,4 @@ function socketFinished(done) {
});
});
}
-socketFinished(common.mustCall(function(err) {
- assert.ifError(err);
-}));
+socketFinished(common.mustSucceed());
diff --git a/test/parallel/test-c-ares.js b/test/parallel/test-c-ares.js
index 87ff8c58f970fe..7576be0589e227 100644
--- a/test/parallel/test-c-ares.js
+++ b/test/parallel/test-c-ares.js
@@ -43,20 +43,17 @@ const dnsPromises = dns.promises;
})().then(common.mustCall());
// Try resolution without hostname.
-dns.lookup(null, common.mustCall((error, result, addressType) => {
- assert.ifError(error);
+dns.lookup(null, common.mustSucceed((result, addressType) => {
assert.strictEqual(result, null);
assert.strictEqual(addressType, 4);
}));
-dns.lookup('127.0.0.1', common.mustCall((error, result, addressType) => {
- assert.ifError(error);
+dns.lookup('127.0.0.1', common.mustSucceed((result, addressType) => {
assert.strictEqual(result, '127.0.0.1');
assert.strictEqual(addressType, 4);
}));
-dns.lookup('::1', common.mustCall((error, result, addressType) => {
- assert.ifError(error);
+dns.lookup('::1', common.mustSucceed((result, addressType) => {
assert.strictEqual(result, '::1');
assert.strictEqual(addressType, 6);
}));
@@ -86,8 +83,7 @@ dns.lookup('::1', common.mustCall((error, result, addressType) => {
// so we disable this test on Windows.
// IBMi reports `ENOTFOUND` when get hostname by address 127.0.0.1
if (!common.isWindows && !common.isIBMi) {
- dns.reverse('127.0.0.1', common.mustCall(function(error, domains) {
- assert.ifError(error);
+ dns.reverse('127.0.0.1', common.mustSucceed((domains) => {
assert.ok(Array.isArray(domains));
}));
diff --git a/test/parallel/test-child-process-exec-any-shells-windows.js b/test/parallel/test-child-process-exec-any-shells-windows.js
index 0e78b665689720..5c34bc77308cc3 100644
--- a/test/parallel/test-child-process-exec-any-shells-windows.js
+++ b/test/parallel/test-child-process-exec-any-shells-windows.js
@@ -17,8 +17,8 @@ fs.mkdirSync(tmpPath);
const test = (shell) => {
cp.exec('echo foo bar', { shell: shell },
- common.mustCall((error, stdout, stderror) => {
- assert.ok(!error && !stderror);
+ common.mustSucceed((stdout, stderror) => {
+ assert.ok(!stderror);
assert.ok(stdout.includes('foo') && stdout.includes('bar'));
}));
};
@@ -43,12 +43,11 @@ test('CMD');
test('powershell');
testCopy('powershell.exe',
`${system32}\\WindowsPowerShell\\v1.0\\powershell.exe`);
-fs.writeFile(`${tmpPath}\\test file`, 'Test', common.mustCall((err) => {
- assert.ifError(err);
+fs.writeFile(`${tmpPath}\\test file`, 'Test', common.mustSucceed(() => {
cp.exec(`Get-ChildItem "${tmpPath}" | Select-Object -Property Name`,
{ shell: 'PowerShell' },
- common.mustCall((error, stdout, stderror) => {
- assert.ok(!error && !stderror);
+ common.mustSucceed((stdout, stderror) => {
+ assert.ok(!stderror);
assert.ok(stdout.includes(
'test file'));
}));
diff --git a/test/parallel/test-child-process-exec-cwd.js b/test/parallel/test-child-process-exec-cwd.js
index c16f77f4c52906..2f86cf10fe5e0f 100644
--- a/test/parallel/test-child-process-exec-cwd.js
+++ b/test/parallel/test-child-process-exec-cwd.js
@@ -34,7 +34,6 @@ if (common.isWindows) {
dir = '/dev';
}
-exec(pwdcommand, { cwd: dir }, common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+exec(pwdcommand, { cwd: dir }, common.mustSucceed((stdout, stderr) => {
assert(stdout.startsWith(dir));
}));
diff --git a/test/parallel/test-child-process-exec-encoding.js b/test/parallel/test-child-process-exec-encoding.js
index d7c059a65ab4d8..0c3178e3f20607 100644
--- a/test/parallel/test-child-process-exec-encoding.js
+++ b/test/parallel/test-child-process-exec-encoding.js
@@ -15,8 +15,7 @@ if (process.argv[2] === 'child') {
function run(options, callback) {
const cmd = `"${process.execPath}" "${__filename}" child`;
- cp.exec(cmd, options, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ cp.exec(cmd, options, common.mustSucceed((stdout, stderr) => {
callback(stdout, stderr);
}));
}
diff --git a/test/parallel/test-child-process-exec-maxbuf.js b/test/parallel/test-child-process-exec-maxbuf.js
index 0f639b5dd90e1d..c434c8531d7ebf 100644
--- a/test/parallel/test-child-process-exec-maxbuf.js
+++ b/test/parallel/test-child-process-exec-maxbuf.js
@@ -27,8 +27,7 @@ function runChecks(err, stdio, streamName, expected) {
const cmd =
`${process.execPath} -e "console.log('a'.repeat(1024 * 1024 - 1))"`;
- cp.exec(cmd, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ cp.exec(cmd, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout.trim(), 'a'.repeat(1024 * 1024 - 1));
assert.strictEqual(stderr, '');
}));
@@ -38,8 +37,7 @@ function runChecks(err, stdio, streamName, expected) {
const cmd = `"${process.execPath}" -e "console.log('hello world');"`;
const options = { maxBuffer: Infinity };
- cp.exec(cmd, options, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ cp.exec(cmd, options, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout.trim(), 'hello world');
assert.strictEqual(stderr, '');
}));
@@ -80,8 +78,7 @@ function runChecks(err, stdio, streamName, expected) {
const cmd =
`"${process.execPath}" -e "console.log('a'.repeat(1024 * 1024 - 1))"`;
- cp.exec(cmd, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ cp.exec(cmd, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout.trim(), 'a'.repeat(1024 * 1024 - 1));
assert.strictEqual(stderr, '');
}));
diff --git a/test/parallel/test-child-process-exec-std-encoding.js b/test/parallel/test-child-process-exec-std-encoding.js
index 11cb66cf42cc5b..08187316726e96 100644
--- a/test/parallel/test-child-process-exec-std-encoding.js
+++ b/test/parallel/test-child-process-exec-std-encoding.js
@@ -13,8 +13,7 @@ if (process.argv[2] === 'child') {
console.error(stderrData);
} else {
const cmd = `"${process.execPath}" "${__filename}" child`;
- const child = cp.exec(cmd, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ const child = cp.exec(cmd, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, expectedStdout);
assert.strictEqual(stderr, expectedStderr);
}));
diff --git a/test/parallel/test-child-process-exec-timeout.js b/test/parallel/test-child-process-exec-timeout.js
index 343050e063c680..ba64dad101724a 100644
--- a/test/parallel/test-child-process-exec-timeout.js
+++ b/test/parallel/test-child-process-exec-timeout.js
@@ -51,8 +51,7 @@ cp.exec(cmd, {
}));
// Test the case where a timeout is set, but not expired.
-cp.exec(cmd, { timeout: 2 ** 30 }, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+cp.exec(cmd, { timeout: 2 ** 30 }, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout.trim(), 'child stdout');
assert.strictEqual(stderr.trim(), 'child stderr');
}));
diff --git a/test/parallel/test-child-process-execfile-maxbuf.js b/test/parallel/test-child-process-execfile-maxbuf.js
index 8cc9b95d374367..22fb9264ea8c53 100644
--- a/test/parallel/test-child-process-execfile-maxbuf.js
+++ b/test/parallel/test-child-process-execfile-maxbuf.js
@@ -25,8 +25,7 @@ function checkFactory(streamName) {
execFile(
process.execPath,
['-e', 'console.log("a".repeat(1024 * 1024 - 1))'],
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout.trim(), 'a'.repeat(1024 * 1024 - 1));
assert.strictEqual(stderr, '');
})
@@ -40,8 +39,7 @@ function checkFactory(streamName) {
process.execPath,
['-e', 'console.log("hello world");'],
options,
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout.trim(), 'hello world');
assert.strictEqual(stderr, '');
})
diff --git a/test/parallel/test-child-process-execfile.js b/test/parallel/test-child-process-execfile.js
index af69d685789d62..bc0495b3332384 100644
--- a/test/parallel/test-child-process-execfile.js
+++ b/test/parallel/test-child-process-execfile.js
@@ -43,7 +43,5 @@ const execOpts = { encoding: 'utf8', shell: true };
{
// Verify the shell option works properly
- execFile(process.execPath, [fixture, 0], execOpts, common.mustCall((err) => {
- assert.ifError(err);
- }));
+ execFile(process.execPath, [fixture, 0], execOpts, common.mustSucceed());
}
diff --git a/test/parallel/test-child-process-fork-getconnections.js b/test/parallel/test-child-process-fork-getconnections.js
index a6843ea64ba41f..62376c489f77c8 100644
--- a/test/parallel/test-child-process-fork-getconnections.js
+++ b/test/parallel/test-child-process-fork-getconnections.js
@@ -97,8 +97,7 @@ if (process.argv[2] === 'child') {
child.once('message', common.mustCall((m) => {
assert.strictEqual(m.status, 'closed');
- server.getConnections(common.mustCall((err, num) => {
- assert.ifError(err);
+ server.getConnections(common.mustSucceed((num) => {
assert.strictEqual(num, count - (i + 1));
closeSockets(i + 1);
}));
diff --git a/test/parallel/test-child-process-send-keep-open.js b/test/parallel/test-child-process-send-keep-open.js
index 2d8a28121ac1fb..54169dc1885f66 100644
--- a/test/parallel/test-child-process-send-keep-open.js
+++ b/test/parallel/test-child-process-send-keep-open.js
@@ -32,9 +32,7 @@ if (process.argv[2] !== 'child') {
});
}));
- child.send('socket', socket, { keepOpen: true }, common.mustCall((err) => {
- assert.ifError(err);
- }));
+ child.send('socket', socket, { keepOpen: true }, common.mustSucceed());
});
server.listen(0, () => {
diff --git a/test/parallel/test-child-process-windows-hide.js b/test/parallel/test-child-process-windows-hide.js
index 1d9593c0a99242..ef4a8be8784ebc 100644
--- a/test/parallel/test-child-process-windows-hide.js
+++ b/test/parallel/test-child-process-windows-hide.js
@@ -42,8 +42,7 @@ internalCp.spawnSync = common.mustCall(function(options) {
}
{
- const callback = common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ const callback = common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout.trim(), '42');
assert.strictEqual(stderr.trim(), '');
});
diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js
index d408f09bb9dff6..e95fee008d6e3a 100644
--- a/test/parallel/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -40,16 +40,14 @@ if (process.argv.length > 2) {
}
// Assert that nothing is written to stdout.
-child.exec(`${nodejs} --eval 42`, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+child.exec(`${nodejs} --eval 42`, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '');
assert.strictEqual(stderr, '');
}));
// Assert that "42\n" is written to stderr.
child.exec(`${nodejs} --eval "console.error(42)"`,
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '');
assert.strictEqual(stderr, '42\n');
}));
@@ -58,14 +56,12 @@ child.exec(`${nodejs} --eval "console.error(42)"`,
['--print', '-p -e', '-pe', '-p'].forEach((s) => {
const cmd = `${nodejs} ${s} `;
- child.exec(`${cmd}42`, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ child.exec(`${cmd}42`, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '42\n');
assert.strictEqual(stderr, '');
}));
- child.exec(`${cmd} '[]'`, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ child.exec(`${cmd} '[]'`, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '[]\n');
assert.strictEqual(stderr, '');
}));
@@ -88,8 +84,7 @@ child.exec(`${nodejs} --eval "console.error(42)"`,
// Check that builtin modules are pre-defined.
child.exec(`${nodejs} --print "os.platform()"`,
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stderr, '');
assert.strictEqual(stdout.trim(), require('os').platform());
}));
@@ -113,22 +108,19 @@ child.exec(`${nodejs} -e`, common.mustCall((err, stdout, stderr) => {
}));
// Empty program should do nothing.
-child.exec(`${nodejs} -e ""`, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+child.exec(`${nodejs} -e ""`, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '');
assert.strictEqual(stderr, '');
}));
// "\\-42" should be interpreted as an escaped expression, not a switch.
-child.exec(`${nodejs} -p "\\-42"`, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+child.exec(`${nodejs} -p "\\-42"`, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '-42\n');
assert.strictEqual(stderr, '');
}));
child.exec(`${nodejs} --use-strict -p process.execArgv`,
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(
stdout, "[ '--use-strict', '-p', 'process.execArgv' ]\n"
);
@@ -143,8 +135,7 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`,
}
child.exec(`${nodejs} -e 'require("child_process").fork("${emptyFile}")'`,
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '');
assert.strictEqual(stderr, '');
}));
@@ -154,8 +145,7 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`,
child.exec(
`${nodejs} -e "process.execArgv = ['-e', 'console.log(42)', 'thirdArg'];` +
`require('child_process').fork('${emptyFile}')"`,
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, '42\n');
assert.strictEqual(stderr, '');
}));
@@ -237,8 +227,7 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`,
const execOptions = '--input-type module';
child.exec(
`${nodejs} ${execOptions} --eval "console.log(42)"`,
- common.mustCall((err, stdout) => {
- assert.ifError(err);
+ common.mustSucceed((stdout) => {
assert.strictEqual(stdout, '42\n');
}));
@@ -263,16 +252,14 @@ child.exec(
// Assert that require is undefined in ESM support
child.exec(
`${nodejs} ${execOptions} --eval "console.log(typeof require);"`,
- common.mustCall((err, stdout) => {
- assert.ifError(err);
+ common.mustSucceed((stdout) => {
assert.strictEqual(stdout, 'undefined\n');
}));
// Assert that import.meta is defined in ESM
child.exec(
`${nodejs} ${execOptions} --eval "console.log(typeof import.meta);"`,
- common.mustCall((err, stdout) => {
- assert.ifError(err);
+ common.mustSucceed((stdout) => {
assert.strictEqual(stdout, 'object\n');
}));
@@ -280,8 +267,7 @@ child.exec(
child.exec(
`${nodejs} ${execOptions} ` +
'--eval "import \'./test/fixtures/es-modules/mjs-file.mjs\'"',
- common.mustCall((err, stdout) => {
- assert.ifError(err);
+ common.mustSucceed((stdout) => {
assert.strictEqual(stdout, '.mjs file\n');
}));
@@ -291,8 +277,7 @@ child.exec(
`${nodejs} ${execOptions} ` +
'--eval "process.chdir(\'..\');' +
'import(\'./test/fixtures/es-modules/mjs-file.mjs\')"',
- common.mustCall((err, stdout) => {
- assert.ifError(err);
+ common.mustSucceed((stdout) => {
assert.strictEqual(stdout, '.mjs file\n');
}));
@@ -300,7 +285,6 @@ child.exec(
`${nodejs} ` +
'--eval "process.chdir(\'..\');' +
'import(\'./test/fixtures/es-modules/mjs-file.mjs\')"',
- common.mustCall((err, stdout) => {
- assert.ifError(err);
+ common.mustSucceed((stdout) => {
assert.strictEqual(stdout, '.mjs file\n');
}));
diff --git a/test/parallel/test-cli-node-print-help.js b/test/parallel/test-cli-node-print-help.js
index e115124b0487fe..ab8cd101350a81 100644
--- a/test/parallel/test-cli-node-print-help.js
+++ b/test/parallel/test-cli-node-print-help.js
@@ -14,8 +14,7 @@ let stdOut;
function startPrintHelpTest() {
- exec(`${process.execPath} --help`, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ exec(`${process.execPath} --help`, common.mustSucceed((stdout, stderr) => {
stdOut = stdout;
validateNodePrintHelp();
}));
diff --git a/test/parallel/test-cluster-http-pipe.js b/test/parallel/test-cluster-http-pipe.js
index 9e039541cd26f1..173ddd04f4f26d 100644
--- a/test/parallel/test-cluster-http-pipe.js
+++ b/test/parallel/test-cluster-http-pipe.js
@@ -51,8 +51,7 @@ http.createServer(common.mustCall((req, res) => {
})).listen(common.PIPE, common.mustCall(() => {
http.get({ socketPath: common.PIPE, path: '/' }, common.mustCall((res) => {
res.resume();
- res.on('end', common.mustCall((err) => {
- assert.ifError(err);
+ res.on('end', common.mustSucceed(() => {
process.send('DONE');
process.exit();
}));
diff --git a/test/parallel/test-cluster-worker-disconnect-on-error.js b/test/parallel/test-cluster-worker-disconnect-on-error.js
index c55e69e256950f..3b03b21ee7a21a 100644
--- a/test/parallel/test-cluster-worker-disconnect-on-error.js
+++ b/test/parallel/test-cluster-worker-disconnect-on-error.js
@@ -10,8 +10,7 @@ const server = http.createServer();
if (cluster.isMaster) {
let worker;
- server.listen(0, common.mustCall((error) => {
- assert.ifError(error);
+ server.listen(0, common.mustSucceed(() => {
assert(worker);
worker.send({ port: server.address().port });
diff --git a/test/parallel/test-crypto-hkdf.js b/test/parallel/test-crypto-hkdf.js
index 5f8bde384c565f..777f184d6b8366 100644
--- a/test/parallel/test-crypto-hkdf.js
+++ b/test/parallel/test-crypto-hkdf.js
@@ -123,8 +123,7 @@ const {
assert(syncResult instanceof ArrayBuffer);
let is_async = false;
hkdf(hash, secret, salt, info, length,
- common.mustCall((err, asyncResult) => {
- assert.ifError(err);
+ common.mustSucceed((asyncResult) => {
assert(is_async);
assert(asyncResult instanceof ArrayBuffer);
assert.deepStrictEqual(syncResult, asyncResult);
@@ -141,8 +140,7 @@ const {
const syncResult = hkdfSync(hash, buf_secret, buf_salt, buf_info, length);
hkdf(hash, buf_secret, buf_salt, buf_info, length,
- common.mustCall((err, asyncResult) => {
- assert.ifError(err);
+ common.mustSucceed((asyncResult) => {
assert.deepStrictEqual(syncResult, asyncResult);
}));
}
@@ -154,8 +152,7 @@ const {
const syncResult = hkdfSync(hash, key_secret, buf_salt, buf_info, length);
hkdf(hash, key_secret, buf_salt, buf_info, length,
- common.mustCall((err, asyncResult) => {
- assert.ifError(err);
+ common.mustSucceed((asyncResult) => {
assert.deepStrictEqual(syncResult, asyncResult);
}));
}
@@ -167,8 +164,7 @@ const {
const syncResult = hkdfSync(hash, ta_secret, ta_salt, ta_info, length);
hkdf(hash, ta_secret, ta_salt, ta_info, length,
- common.mustCall((err, asyncResult) => {
- assert.ifError(err);
+ common.mustSucceed((asyncResult) => {
assert.deepStrictEqual(syncResult, asyncResult);
}));
}
@@ -185,8 +181,7 @@ const {
ta_info.buffer,
length);
hkdf(hash, ta_secret, ta_salt, ta_info, length,
- common.mustCall((err, asyncResult) => {
- assert.ifError(err);
+ common.mustSucceed((asyncResult) => {
assert.deepStrictEqual(syncResult, asyncResult);
}));
}
@@ -203,8 +198,7 @@ const {
sa_info,
length);
hkdf(hash, ta_secret, sa_salt, sa_info, length,
- common.mustCall((err, asyncResult) => {
- assert.ifError(err);
+ common.mustSucceed((asyncResult) => {
assert.deepStrictEqual(syncResult, asyncResult);
}));
}
diff --git a/test/parallel/test-crypto-keygen.js b/test/parallel/test-crypto-keygen.js
index ae62db23c0940f..6a978c97fd171e 100644
--- a/test/parallel/test-crypto-keygen.js
+++ b/test/parallel/test-crypto-keygen.js
@@ -143,9 +143,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
type: 'pkcs1',
format: 'pem'
}
- }, common.mustCall((err, publicKeyDER, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKeyDER, privateKey) => {
assert(Buffer.isBuffer(publicKeyDER));
assertApproximateSize(publicKeyDER, 74);
@@ -169,9 +167,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
cipher: 'aes-256-cbc',
passphrase: 'secret'
}
- }, common.mustCall((err, publicKeyDER, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKeyDER, privateKey) => {
assert(Buffer.isBuffer(publicKeyDER));
assertApproximateSize(publicKeyDER, 74);
@@ -202,9 +198,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
cipher: 'aes-256-cbc',
passphrase: 'secret'
}
- }, common.mustCall((err, publicKeyDER, privateKeyDER) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKeyDER, privateKeyDER) => {
assert(Buffer.isBuffer(publicKeyDER));
assertApproximateSize(publicKeyDER, 74);
@@ -245,9 +239,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
type: 'pkcs8',
format: 'der'
}
- }, common.mustCall((err, publicKeyDER, privateKeyDER) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKeyDER, privateKeyDER) => {
assert(Buffer.isBuffer(publicKeyDER));
assertApproximateSize(publicKeyDER, 74);
@@ -272,9 +264,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
saltLength: 16,
hash: 'sha256',
mgf1Hash: 'sha256'
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(publicKey.type, 'public');
assert.strictEqual(publicKey.asymmetricKeyType, 'rsa-pss');
@@ -321,9 +311,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
passphrase: 'secret',
...privateKeyEncoding
}
- }, common.mustCall((err, publicKey, privateKeyDER) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKeyDER) => {
assert.strictEqual(typeof publicKey, 'string');
assert(spkiExp.test(publicKey));
// The private key is DER-encoded.
@@ -367,9 +355,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
type: 'sec1',
format: 'pem'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(typeof publicKey, 'string');
assert(spkiExp.test(publicKey));
assert.strictEqual(typeof privateKey, 'string');
@@ -391,9 +377,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
type: 'sec1',
format: 'pem'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(typeof publicKey, 'string');
assert(spkiExp.test(publicKey));
assert.strictEqual(typeof privateKey, 'string');
@@ -416,9 +400,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
cipher: 'aes-128-cbc',
passphrase: 'secret'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(typeof publicKey, 'string');
assert(spkiExp.test(publicKey));
assert.strictEqual(typeof privateKey, 'string');
@@ -448,9 +430,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
cipher: 'aes-128-cbc',
passphrase: 'secret'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(typeof publicKey, 'string');
assert(spkiExp.test(publicKey));
assert.strictEqual(typeof privateKey, 'string');
@@ -483,9 +463,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
cipher: 'aes-128-cbc',
passphrase: 'top secret'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(typeof publicKey, 'string');
assert(spkiExp.test(publicKey));
assert.strictEqual(typeof privateKey, 'string');
@@ -519,9 +497,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
cipher: 'aes-128-cbc',
passphrase: 'top secret'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(typeof publicKey, 'string');
assert(spkiExp.test(publicKey));
assert.strictEqual(typeof privateKey, 'string');
@@ -637,9 +613,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
type: 'pkcs1',
format: 'pem'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(typeof publicKey, 'object');
assert.strictEqual(publicKey.type, 'public');
assert.strictEqual(publicKey.asymmetricKeyType, 'rsa');
@@ -658,9 +632,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
type: 'pkcs1',
format: 'pem'
}
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
// The public key should still be a string.
assert.strictEqual(typeof publicKey, 'string');
@@ -954,16 +926,14 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
namedCurve: 'P-256',
publicKeyEncoding: { type: 'spki', format: 'pem' },
privateKeyEncoding: { type: 'pkcs8', format: 'pem' }
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
+ }, common.mustSucceed((publicKey, privateKey) => {
}));
generateKeyPair('ec', {
namedCurve: 'secp256k1',
publicKeyEncoding: { type: 'spki', format: 'pem' },
privateKeyEncoding: { type: 'pkcs8', format: 'pem' }
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
+ }, common.mustSucceed((publicKey, privateKey) => {
}));
}
@@ -971,9 +941,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
{
if (!/^1\.1\.0/.test(process.versions.openssl)) {
['ed25519', 'ed448', 'x25519', 'x448'].forEach((keyType) => {
- generateKeyPair(keyType, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ generateKeyPair(keyType, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(publicKey.type, 'public');
assert.strictEqual(publicKey.asymmetricKeyType, keyType);
@@ -988,9 +956,7 @@ const sec1EncExp = (cipher) => getRegExpForPEM('EC PRIVATE KEY', cipher);
{
generateKeyPair('dh', {
primeLength: 1024
- }, common.mustCall((err, publicKey, privateKey) => {
- assert.ifError(err);
-
+ }, common.mustSucceed((publicKey, privateKey) => {
assert.strictEqual(publicKey.type, 'public');
assert.strictEqual(publicKey.asymmetricKeyType, 'dh');
diff --git a/test/parallel/test-crypto-pbkdf2.js b/test/parallel/test-crypto-pbkdf2.js
index d963395c03388f..721df71fe72d93 100644
--- a/test/parallel/test-crypto-pbkdf2.js
+++ b/test/parallel/test-crypto-pbkdf2.js
@@ -48,9 +48,8 @@ const expected =
const key = crypto.pbkdf2Sync('password', 'salt', 32, 32, 'sha256');
assert.strictEqual(key.toString('hex'), expected);
-crypto.pbkdf2('password', 'salt', 32, 32, 'sha256', common.mustCall(ondone));
-function ondone(err, key) {
- assert.ifError(err);
+crypto.pbkdf2('password', 'salt', 32, 32, 'sha256', common.mustSucceed(ondone));
+function ondone(key) {
assert.strictEqual(key.toString('hex'), expected);
}
@@ -115,7 +114,7 @@ for (const iterations of [-1, 0]) {
// Should not get FATAL ERROR with empty password and salt
// https://github.com/nodejs/node/issues/8571
-crypto.pbkdf2('', '', 1, 32, 'sha256', common.mustCall(assert.ifError));
+crypto.pbkdf2('', '', 1, 32, 'sha256', common.mustSucceed());
assert.throws(
() => crypto.pbkdf2('password', 'salt', 8, 8, common.mustNotCall()),
@@ -199,22 +198,22 @@ assert.throws(
});
// Any TypedArray should work for password and salt
-crypto.pbkdf2(new Uint8Array(10), 'salt', 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2('pass', new Uint8Array(10), 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2(new Uint16Array(10), 'salt', 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2('pass', new Uint16Array(10), 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2(new Uint32Array(10), 'salt', 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2('pass', new Uint32Array(10), 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2(new Float32Array(10), 'salt', 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2('pass', new Float32Array(10), 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2(new Float64Array(10), 'salt', 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2('pass', new Float64Array(10), 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2(new ArrayBuffer(10), 'salt', 8, 8, 'sha256', common.mustCall());
-crypto.pbkdf2('pass', new ArrayBuffer(10), 8, 8, 'sha256', common.mustCall());
+crypto.pbkdf2(new Uint8Array(10), 'salt', 8, 8, 'sha256', common.mustSucceed());
+crypto.pbkdf2('pass', new Uint8Array(10), 8, 8, 'sha256', common.mustSucceed());
+crypto.pbkdf2(new Uint16Array(10), 'salt', 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2('pass', new Uint16Array(10), 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2(new Uint32Array(10), 'salt', 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2('pass', new Uint32Array(10), 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2(new Float32Array(10), 'salt', 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2('pass', new Float32Array(10), 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2(new Float64Array(10), 'salt', 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2('pass', new Float64Array(10), 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2(new ArrayBuffer(10), 'salt', 8, 8, 'sha1', common.mustSucceed());
+crypto.pbkdf2('pass', new ArrayBuffer(10), 8, 8, 'sha1', common.mustSucceed());
crypto.pbkdf2(new SharedArrayBuffer(10), 'salt', 8, 8, 'sha256',
- common.mustCall());
+ common.mustSucceed());
crypto.pbkdf2('pass', new SharedArrayBuffer(10), 8, 8, 'sha256',
- common.mustCall());
+ common.mustSucceed());
crypto.pbkdf2Sync(new Uint8Array(10), 'salt', 8, 8, 'sha256');
crypto.pbkdf2Sync('pass', new Uint8Array(10), 8, 8, 'sha256');
diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js
index 523accb76d55e6..9472f8ef07dde0 100644
--- a/test/parallel/test-crypto-random.js
+++ b/test/parallel/test-crypto-random.js
@@ -129,8 +129,7 @@ common.expectWarning('DeprecationWarning',
{
const buf = Buffer.alloc(10);
const before = buf.toString('hex');
- crypto.randomFill(buf, common.mustCall((err, buf) => {
- assert.ifError(err);
+ crypto.randomFill(buf, common.mustSucceed((buf) => {
const after = buf.toString('hex');
assert.notStrictEqual(before, after);
}));
@@ -139,8 +138,7 @@ common.expectWarning('DeprecationWarning',
{
const buf = new Uint8Array(new Array(10).fill(0));
const before = Buffer.from(buf).toString('hex');
- crypto.randomFill(buf, common.mustCall((err, buf) => {
- assert.ifError(err);
+ crypto.randomFill(buf, common.mustSucceed((buf) => {
const after = Buffer.from(buf).toString('hex');
assert.notStrictEqual(before, after);
}));
@@ -155,8 +153,7 @@ common.expectWarning('DeprecationWarning',
new DataView(new ArrayBuffer(10))
].forEach((buf) => {
const before = Buffer.from(buf.buffer).toString('hex');
- crypto.randomFill(buf, common.mustCall((err, buf) => {
- assert.ifError(err);
+ crypto.randomFill(buf, common.mustSucceed((buf) => {
const after = Buffer.from(buf.buffer).toString('hex');
assert.notStrictEqual(before, after);
}));
@@ -169,8 +166,7 @@ common.expectWarning('DeprecationWarning',
new SharedArrayBuffer(10)
].forEach((buf) => {
const before = Buffer.from(buf).toString('hex');
- crypto.randomFill(buf, common.mustCall((err, buf) => {
- assert.ifError(err);
+ crypto.randomFill(buf, common.mustSucceed((buf) => {
const after = Buffer.from(buf).toString('hex');
assert.notStrictEqual(before, after);
}));
@@ -207,8 +203,7 @@ common.expectWarning('DeprecationWarning',
{
const buf = Buffer.alloc(10);
const before = buf.toString('hex');
- crypto.randomFill(buf, 5, 5, common.mustCall((err, buf) => {
- assert.ifError(err);
+ crypto.randomFill(buf, 5, 5, common.mustSucceed((buf) => {
const after = buf.toString('hex');
assert.notStrictEqual(before, after);
assert.deepStrictEqual(before.slice(0, 5), after.slice(0, 5));
@@ -218,8 +213,7 @@ common.expectWarning('DeprecationWarning',
{
const buf = new Uint8Array(new Array(10).fill(0));
const before = Buffer.from(buf).toString('hex');
- crypto.randomFill(buf, 5, 5, common.mustCall((err, buf) => {
- assert.ifError(err);
+ crypto.randomFill(buf, 5, 5, common.mustSucceed((buf) => {
const after = Buffer.from(buf).toString('hex');
assert.notStrictEqual(before, after);
assert.deepStrictEqual(before.slice(0, 5), after.slice(0, 5));
@@ -356,8 +350,7 @@ assert.throws(
// Asynchronous API
const randomInts = [];
for (let i = 0; i < 100; i++) {
- crypto.randomInt(3, common.mustCall((err, n) => {
- assert.ifError(err);
+ crypto.randomInt(3, common.mustSucceed((n) => {
assert.ok(n >= 0);
assert.ok(n < 3);
randomInts.push(n);
@@ -391,8 +384,7 @@ assert.throws(
// Positive range
const randomInts = [];
for (let i = 0; i < 100; i++) {
- crypto.randomInt(1, 3, common.mustCall((err, n) => {
- assert.ifError(err);
+ crypto.randomInt(1, 3, common.mustSucceed((n) => {
assert.ok(n >= 1);
assert.ok(n < 3);
randomInts.push(n);
@@ -409,8 +401,7 @@ assert.throws(
// Negative range
const randomInts = [];
for (let i = 0; i < 100; i++) {
- crypto.randomInt(-10, -8, common.mustCall((err, n) => {
- assert.ifError(err);
+ crypto.randomInt(-10, -8, common.mustSucceed((n) => {
assert.ok(n >= -10);
assert.ok(n < -8);
randomInts.push(n);
@@ -468,8 +459,8 @@ assert.throws(
const maxInt = Number.MAX_SAFE_INTEGER;
const minInt = Number.MIN_SAFE_INTEGER;
- crypto.randomInt(minInt, minInt + 5, common.mustCall());
- crypto.randomInt(maxInt - 5, maxInt, common.mustCall());
+ crypto.randomInt(minInt, minInt + 5, common.mustSucceed());
+ crypto.randomInt(maxInt - 5, maxInt, common.mustSucceed());
assert.throws(
() => crypto.randomInt(minInt - 1, minInt + 5, common.mustNotCall()),
@@ -491,8 +482,8 @@ assert.throws(
}
);
- crypto.randomInt(1, common.mustCall());
- crypto.randomInt(0, 1, common.mustCall());
+ crypto.randomInt(1, common.mustSucceed());
+ crypto.randomInt(0, 1, common.mustSucceed());
for (const arg of [[0], [1, 1], [3, 2], [-5, -5], [11, -10]]) {
assert.throws(() => crypto.randomInt(...arg, common.mustNotCall()), {
code: 'ERR_OUT_OF_RANGE',
@@ -504,8 +495,8 @@ assert.throws(
}
const MAX_RANGE = 0xFFFF_FFFF_FFFF;
- crypto.randomInt(MAX_RANGE, common.mustCall());
- crypto.randomInt(1, MAX_RANGE + 1, common.mustCall());
+ crypto.randomInt(MAX_RANGE, common.mustSucceed());
+ crypto.randomInt(1, MAX_RANGE + 1, common.mustSucceed());
assert.throws(
() => crypto.randomInt(1, MAX_RANGE + 2, common.mustNotCall()),
{
diff --git a/test/parallel/test-crypto-scrypt.js b/test/parallel/test-crypto-scrypt.js
index ff074bba06d324..6c19dee23291bb 100644
--- a/test/parallel/test-crypto-scrypt.js
+++ b/test/parallel/test-crypto-scrypt.js
@@ -149,8 +149,7 @@ for (const options of good) {
const { pass, salt, keylen, expected } = options;
const actual = crypto.scryptSync(pass, salt, keylen, options);
assert.strictEqual(actual.toString('hex'), expected);
- crypto.scrypt(pass, salt, keylen, options, common.mustCall((err, actual) => {
- assert.ifError(err);
+ crypto.scrypt(pass, salt, keylen, options, common.mustSucceed((actual) => {
assert.strictEqual(actual.toString('hex'), expected);
}));
}
@@ -184,8 +183,7 @@ for (const options of toobig) {
const expected = crypto.scryptSync('pass', 'salt', 1, defaults);
const actual = crypto.scryptSync('pass', 'salt', 1);
assert.deepStrictEqual(actual.toString('hex'), expected.toString('hex'));
- crypto.scrypt('pass', 'salt', 1, common.mustCall((err, actual) => {
- assert.ifError(err);
+ crypto.scrypt('pass', 'salt', 1, common.mustSucceed((actual) => {
assert.deepStrictEqual(actual.toString('hex'), expected.toString('hex'));
}));
}
@@ -200,8 +198,7 @@ for (const options of toobig) {
const actual = crypto.scryptSync('pass', 'salt', 1);
assert.deepStrictEqual(actual, expected.toString(testEncoding));
- crypto.scrypt('pass', 'salt', 1, common.mustCall((err, actual) => {
- assert.ifError(err);
+ crypto.scrypt('pass', 'salt', 1, common.mustSucceed((actual) => {
assert.deepStrictEqual(actual, expected.toString(testEncoding));
}));
@@ -225,8 +222,7 @@ for (const { args, expected } of badargs) {
// Values for maxmem that do not fit in 32 bits but that are still safe
// integers should be allowed.
crypto.scrypt('', '', 4, { maxmem: 2 ** 52 },
- common.mustCall((err, actual) => {
- assert.ifError(err);
+ common.mustSucceed((actual) => {
assert.strictEqual(actual.toString('hex'), 'd72c87d0');
}));
diff --git a/test/parallel/test-crypto-secret-keygen.js b/test/parallel/test-crypto-secret-keygen.js
index 10a776ff0598a2..ab662aeb5d123b 100644
--- a/test/parallel/test-crypto-secret-keygen.js
+++ b/test/parallel/test-crypto-secret-keygen.js
@@ -76,8 +76,7 @@ assert.throws(() => generateKeySync('aes', { length: 123 }), {
const keybuf = key.export();
assert.strictEqual(keybuf.byteLength, 128 / 8);
- generateKey('aes', { length: 128 }, common.mustCall((err, key) => {
- assert.ifError(err);
+ generateKey('aes', { length: 128 }, common.mustSucceed((key) => {
assert(key);
const keybuf = key.export();
assert.strictEqual(keybuf.byteLength, 128 / 8);
@@ -90,8 +89,7 @@ assert.throws(() => generateKeySync('aes', { length: 123 }), {
const keybuf = key.export();
assert.strictEqual(keybuf.byteLength, 256 / 8);
- generateKey('aes', { length: 256 }, common.mustCall((err, key) => {
- assert.ifError(err);
+ generateKey('aes', { length: 256 }, common.mustSucceed((key) => {
assert(key);
const keybuf = key.export();
assert.strictEqual(keybuf.byteLength, 256 / 8);
@@ -104,8 +102,7 @@ assert.throws(() => generateKeySync('aes', { length: 123 }), {
const keybuf = key.export();
assert.strictEqual(keybuf.byteLength, Math.floor(123 / 8));
- generateKey('hmac', { length: 123 }, common.mustCall((err, key) => {
- assert.ifError(err);
+ generateKey('hmac', { length: 123 }, common.mustSucceed((key) => {
assert(key);
const keybuf = key.export();
assert.strictEqual(keybuf.byteLength, Math.floor(123 / 8));
diff --git a/test/parallel/test-dgram-connect-send-callback-buffer-length.js b/test/parallel/test-dgram-connect-send-callback-buffer-length.js
index 08c220682e79af..723b2738e2ef1d 100644
--- a/test/parallel/test-dgram-connect-send-callback-buffer-length.js
+++ b/test/parallel/test-dgram-connect-send-callback-buffer-length.js
@@ -10,8 +10,7 @@ const buf = Buffer.allocUnsafe(256);
const offset = 20;
const len = buf.length - offset;
-const messageSent = common.mustCall(function messageSent(err, bytes) {
- assert.ifError(err);
+const messageSent = common.mustSucceed(function messageSent(bytes) {
assert.notStrictEqual(bytes, buf.length);
assert.strictEqual(bytes, buf.length - offset);
client.close();
diff --git a/test/parallel/test-dgram-connect-send-callback-buffer.js b/test/parallel/test-dgram-connect-send-callback-buffer.js
index ad756b03effa6f..d6ef1f510cce21 100644
--- a/test/parallel/test-dgram-connect-send-callback-buffer.js
+++ b/test/parallel/test-dgram-connect-send-callback-buffer.js
@@ -8,8 +8,7 @@ const client = dgram.createSocket('udp4');
const buf = Buffer.allocUnsafe(256);
-const onMessage = common.mustCall(function(err, bytes) {
- assert.ifError(err);
+const onMessage = common.mustSucceed((bytes) => {
assert.strictEqual(bytes, buf.length);
client.close();
});
diff --git a/test/parallel/test-dgram-connect-send-empty-buffer.js b/test/parallel/test-dgram-connect-send-empty-buffer.js
index c41ce8309f59bd..bce4c82e5c876e 100644
--- a/test/parallel/test-dgram-connect-send-empty-buffer.js
+++ b/test/parallel/test-dgram-connect-send-empty-buffer.js
@@ -10,7 +10,7 @@ client.bind(0, common.mustCall(function() {
const port = this.address().port;
client.connect(port, common.mustCall(() => {
const buf = Buffer.alloc(0);
- client.send(buf, 0, 0, common.mustCall());
+ client.send(buf, 0, 0, common.mustSucceed());
}));
client.on('message', common.mustCall((buffer) => {
diff --git a/test/parallel/test-dgram-connect-send-multi-buffer-copy.js b/test/parallel/test-dgram-connect-send-multi-buffer-copy.js
index ae8de70a6b4799..0859a0cf86f465 100644
--- a/test/parallel/test-dgram-connect-send-multi-buffer-copy.js
+++ b/test/parallel/test-dgram-connect-send-multi-buffer-copy.js
@@ -6,8 +6,7 @@ const dgram = require('dgram');
const client = dgram.createSocket('udp4');
-const onMessage = common.mustCall(common.mustCall((err, bytes) => {
- assert.ifError(err);
+const onMessage = common.mustCall(common.mustSucceed((bytes) => {
assert.strictEqual(bytes, buf1.length + buf2.length);
}));
diff --git a/test/parallel/test-dgram-send-address-types.js b/test/parallel/test-dgram-send-address-types.js
index d64558bac4424e..a88ef088dcf8a9 100644
--- a/test/parallel/test-dgram-send-address-types.js
+++ b/test/parallel/test-dgram-send-address-types.js
@@ -5,8 +5,7 @@ const dgram = require('dgram');
const buf = Buffer.from('test');
-const onMessage = common.mustCall((err, bytes) => {
- assert.ifError(err);
+const onMessage = common.mustSucceed((bytes) => {
assert.strictEqual(bytes, buf.length);
}, 6);
diff --git a/test/parallel/test-dgram-send-callback-buffer-empty-address.js b/test/parallel/test-dgram-send-callback-buffer-empty-address.js
index 5b3b1c41a1917c..f6254ec43e90d6 100644
--- a/test/parallel/test-dgram-send-callback-buffer-empty-address.js
+++ b/test/parallel/test-dgram-send-callback-buffer-empty-address.js
@@ -8,8 +8,7 @@ const client = dgram.createSocket('udp4');
const buf = Buffer.alloc(256, 'x');
-const onMessage = common.mustCall(function(err, bytes) {
- assert.ifError(err);
+const onMessage = common.mustSucceed((bytes) => {
assert.strictEqual(bytes, buf.length);
client.close();
});
diff --git a/test/parallel/test-dgram-send-callback-buffer-length-empty-address.js b/test/parallel/test-dgram-send-callback-buffer-length-empty-address.js
index 544f66702494da..a95018d14b220a 100644
--- a/test/parallel/test-dgram-send-callback-buffer-length-empty-address.js
+++ b/test/parallel/test-dgram-send-callback-buffer-length-empty-address.js
@@ -10,8 +10,7 @@ const buf = Buffer.alloc(256, 'x');
const offset = 20;
const len = buf.length - offset;
-const onMessage = common.mustCall(function messageSent(err, bytes) {
- assert.ifError(err);
+const onMessage = common.mustSucceed(function messageSent(bytes) {
assert.notStrictEqual(bytes, buf.length);
assert.strictEqual(bytes, buf.length - offset);
client.close();
diff --git a/test/parallel/test-dgram-send-callback-buffer-length.js b/test/parallel/test-dgram-send-callback-buffer-length.js
index bf1b351df33e7b..f570ecb20db710 100644
--- a/test/parallel/test-dgram-send-callback-buffer-length.js
+++ b/test/parallel/test-dgram-send-callback-buffer-length.js
@@ -31,8 +31,7 @@ const buf = Buffer.allocUnsafe(256);
const offset = 20;
const len = buf.length - offset;
-const messageSent = common.mustCall(function messageSent(err, bytes) {
- assert.ifError(err);
+const messageSent = common.mustSucceed(function messageSent(bytes) {
assert.notStrictEqual(bytes, buf.length);
assert.strictEqual(bytes, buf.length - offset);
client.close();
diff --git a/test/parallel/test-dgram-send-callback-buffer.js b/test/parallel/test-dgram-send-callback-buffer.js
index c174e585d61282..11f8208de912bb 100644
--- a/test/parallel/test-dgram-send-callback-buffer.js
+++ b/test/parallel/test-dgram-send-callback-buffer.js
@@ -8,8 +8,7 @@ const client = dgram.createSocket('udp4');
const buf = Buffer.allocUnsafe(256);
-const onMessage = common.mustCall(function(err, bytes) {
- assert.ifError(err);
+const onMessage = common.mustSucceed((bytes) => {
assert.strictEqual(bytes, buf.length);
client.close();
});
diff --git a/test/parallel/test-dgram-send-callback-multi-buffer-empty-address.js b/test/parallel/test-dgram-send-callback-multi-buffer-empty-address.js
index cef71083c71a36..37e9e04c4462cf 100644
--- a/test/parallel/test-dgram-send-callback-multi-buffer-empty-address.js
+++ b/test/parallel/test-dgram-send-callback-multi-buffer-empty-address.js
@@ -6,8 +6,7 @@ const dgram = require('dgram');
const client = dgram.createSocket('udp4');
-const messageSent = common.mustCall(function messageSent(err, bytes) {
- assert.ifError(err);
+const messageSent = common.mustSucceed(function messageSent(bytes) {
assert.strictEqual(bytes, buf1.length + buf2.length);
});
diff --git a/test/parallel/test-dns-lookup.js b/test/parallel/test-dns-lookup.js
index 0885c151a85290..606c1c10e68e53 100644
--- a/test/parallel/test-dns-lookup.js
+++ b/test/parallel/test-dns-lookup.js
@@ -115,8 +115,7 @@ dns.lookup(false, {
hints: 0,
family: 0,
all: true
-}, common.mustCall((error, result, addressType) => {
- assert.ifError(error);
+}, common.mustSucceed((result, addressType) => {
assert.deepStrictEqual(result, []);
assert.strictEqual(addressType, undefined);
}));
@@ -125,8 +124,7 @@ dns.lookup('127.0.0.1', {
hints: 0,
family: 4,
all: true
-}, common.mustCall((error, result, addressType) => {
- assert.ifError(error);
+}, common.mustSucceed((result, addressType) => {
assert.deepStrictEqual(result, [{
address: '127.0.0.1',
family: 4
@@ -138,8 +136,7 @@ dns.lookup('127.0.0.1', {
hints: 0,
family: 4,
all: false
-}, common.mustCall((error, result, addressType) => {
- assert.ifError(error);
+}, common.mustSucceed((result, addressType) => {
assert.deepStrictEqual(result, '127.0.0.1');
assert.strictEqual(addressType, 4);
}));
diff --git a/test/parallel/test-dns-multi-channel.js b/test/parallel/test-dns-multi-channel.js
index bd88fe0b24fc75..890c10c9862741 100644
--- a/test/parallel/test-dns-multi-channel.js
+++ b/test/parallel/test-dns-multi-channel.js
@@ -44,8 +44,7 @@ function ready() {
for (const { server: { socket, reply }, resolver } of resolvers) {
resolver.setServers([`127.0.0.1:${socket.address().port}`]);
- resolver.resolve4('example.org', common.mustCall((err, res) => {
- assert.ifError(err);
+ resolver.resolve4('example.org', common.mustSucceed((res) => {
assert.deepStrictEqual(res, [reply.address]);
socket.close();
}));
diff --git a/test/parallel/test-dns-resolveany.js b/test/parallel/test-dns-resolveany.js
index ea242ed45dbfe3..7cc4a046ba7e2c 100644
--- a/test/parallel/test-dns-resolveany.js
+++ b/test/parallel/test-dns-resolveany.js
@@ -50,8 +50,7 @@ server.bind(0, common.mustCall(async () => {
validateResults(await dnsPromises.resolveAny('example.org'));
- dns.resolveAny('example.org', common.mustCall((err, res) => {
- assert.ifError(err);
+ dns.resolveAny('example.org', common.mustSucceed((res) => {
validateResults(res);
server.close();
}));
diff --git a/test/parallel/test-dns.js b/test/parallel/test-dns.js
index 8d646d8ec3b02b..bb5e732a42e25b 100644
--- a/test/parallel/test-dns.js
+++ b/test/parallel/test-dns.js
@@ -442,8 +442,7 @@ assert.throws(() => {
validateResults(await dnsPromises[method]('example.org', options));
- dns[method]('example.org', options, common.mustCall((err, res) => {
- assert.ifError(err);
+ dns[method]('example.org', options, common.mustSucceed((res) => {
validateResults(res);
cases.shift();
nextCase();
diff --git a/test/parallel/test-domain-crypto.js b/test/parallel/test-domain-crypto.js
index cb397c2fe33eb6..e0a470bd9db515 100644
--- a/test/parallel/test-domain-crypto.js
+++ b/test/parallel/test-domain-crypto.js
@@ -35,9 +35,9 @@ global.domain = require('domain');
// Should not throw a 'TypeError: undefined is not a function' exception
crypto.randomBytes(8);
-crypto.randomBytes(8, common.mustCall());
+crypto.randomBytes(8, common.mustSucceed());
const buf = Buffer.alloc(8);
crypto.randomFillSync(buf);
crypto.pseudoRandomBytes(8);
-crypto.pseudoRandomBytes(8, common.mustCall());
-crypto.pbkdf2('password', 'salt', 8, 8, 'sha1', common.mustCall());
+crypto.pseudoRandomBytes(8, common.mustSucceed());
+crypto.pbkdf2('password', 'salt', 8, 8, 'sha1', common.mustSucceed());
diff --git a/test/parallel/test-eslint-prefer-common-mustsucceed.js b/test/parallel/test-eslint-prefer-common-mustsucceed.js
new file mode 100644
index 00000000000000..fa16fa5f4c29e8
--- /dev/null
+++ b/test/parallel/test-eslint-prefer-common-mustsucceed.js
@@ -0,0 +1,52 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
+
+common.skipIfEslintMissing();
+
+const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
+const rule = require('../../tools/eslint-rules/prefer-common-mustsucceed');
+
+const msg1 = 'Please use common.mustSucceed instead of ' +
+ 'common.mustCall(assert.ifError).';
+const msg2 = 'Please use common.mustSucceed instead of ' +
+ 'common.mustCall with assert.ifError.';
+
+new RuleTester({
+ parserOptions: { ecmaVersion: 2015 }
+}).run('prefer-common-mustsucceed', rule, {
+ valid: [
+ 'foo((err) => assert.ifError(err))',
+ 'foo(function(err) { assert.ifError(err) })',
+ 'foo(assert.ifError)',
+ 'common.mustCall((err) => err)'
+ ],
+ invalid: [
+ {
+ code: 'common.mustCall(assert.ifError)',
+ errors: [{ message: msg1 }]
+ },
+ {
+ code: 'common.mustCall((err) => assert.ifError(err))',
+ errors: [{ message: msg2 }]
+ },
+ {
+ code: 'common.mustCall((e) => assert.ifError(e))',
+ errors: [{ message: msg2 }]
+ },
+ {
+ code: 'common.mustCall(function(e) { assert.ifError(e); })',
+ errors: [{ message: msg2 }]
+ },
+ {
+ code: 'common.mustCall(function(e) { return assert.ifError(e); })',
+ errors: [{ message: msg2 }]
+ },
+ {
+ code: 'common.mustCall(function(e) {{ assert.ifError(e); }})',
+ errors: [{ message: msg2 }]
+ }
+ ]
+});
diff --git a/test/parallel/test-fs-append-file.js b/test/parallel/test-fs-append-file.js
index 594a93b7c4cbe2..a191f8b20693c1 100644
--- a/test/parallel/test-fs-append-file.js
+++ b/test/parallel/test-fs-append-file.js
@@ -45,11 +45,8 @@ const throwNextTick = (e) => { process.nextTick(() => { throw e; }); };
{
const filename = join(tmpdir.path, 'append.txt');
- fs.appendFile(filename, s, common.mustCall(function(e) {
- assert.ifError(e);
-
- fs.readFile(filename, common.mustCall(function(e, buffer) {
- assert.ifError(e);
+ fs.appendFile(filename, s, common.mustSucceed(() => {
+ fs.readFile(filename, common.mustSucceed((buffer) => {
assert.strictEqual(Buffer.byteLength(s), buffer.length);
}));
}));
@@ -72,11 +69,8 @@ const throwNextTick = (e) => { process.nextTick(() => { throw e; }); };
const filename = join(tmpdir.path, 'append-non-empty.txt');
fs.writeFileSync(filename, currentFileData);
- fs.appendFile(filename, s, common.mustCall(function(e) {
- assert.ifError(e);
-
- fs.readFile(filename, common.mustCall(function(e, buffer) {
- assert.ifError(e);
+ fs.appendFile(filename, s, common.mustSucceed(() => {
+ fs.readFile(filename, common.mustSucceed((buffer) => {
assert.strictEqual(Buffer.byteLength(s) + currentFileData.length,
buffer.length);
}));
@@ -104,11 +98,8 @@ const throwNextTick = (e) => { process.nextTick(() => { throw e; }); };
const buf = Buffer.from(s, 'utf8');
- fs.appendFile(filename, buf, common.mustCall((e) => {
- assert.ifError(e);
-
- fs.readFile(filename, common.mustCall((e, buffer) => {
- assert.ifError(e);
+ fs.appendFile(filename, buf, common.mustSucceed(() => {
+ fs.readFile(filename, common.mustSucceed((buffer) => {
assert.strictEqual(buf.length + currentFileData.length, buffer.length);
}));
}));
@@ -166,17 +157,10 @@ const throwNextTick = (e) => { process.nextTick(() => { throw e; }); };
const filename = join(tmpdir.path, 'append-descriptors.txt');
fs.writeFileSync(filename, currentFileData);
- fs.open(filename, 'a+', common.mustCall((e, fd) => {
- assert.ifError(e);
-
- fs.appendFile(fd, s, common.mustCall((e) => {
- assert.ifError(e);
-
- fs.close(fd, common.mustCall((e) => {
- assert.ifError(e);
-
- fs.readFile(filename, common.mustCall((e, buffer) => {
- assert.ifError(e);
+ fs.open(filename, 'a+', common.mustSucceed((fd) => {
+ fs.appendFile(fd, s, common.mustSucceed(() => {
+ fs.close(fd, common.mustSucceed(() => {
+ fs.readFile(filename, common.mustSucceed((buffer) => {
assert.strictEqual(Buffer.byteLength(s) + currentFileData.length,
buffer.length);
}));
diff --git a/test/parallel/test-fs-buffer.js b/test/parallel/test-fs-buffer.js
index d9afbaf7fa08ec..4c81c13e26977f 100644
--- a/test/parallel/test-fs-buffer.js
+++ b/test/parallel/test-fs-buffer.js
@@ -9,13 +9,12 @@ const path = require('path');
const tmpdir = require('../common/tmpdir');
tmpdir.refresh();
-fs.access(Buffer.from(tmpdir.path), common.mustCall(assert.ifError));
+fs.access(Buffer.from(tmpdir.path), common.mustSucceed());
const buf = Buffer.from(path.join(tmpdir.path, 'a.txt'));
-fs.open(buf, 'w+', common.mustCall((err, fd) => {
- assert.ifError(err);
+fs.open(buf, 'w+', common.mustSucceed((fd) => {
assert(fd);
- fs.close(fd, common.mustCall(assert.ifError));
+ fs.close(fd, common.mustSucceed());
}));
assert.throws(
@@ -31,10 +30,8 @@ assert.throws(
);
const dir = Buffer.from(fixtures.fixturesDir);
-fs.readdir(dir, 'hex', common.mustCall((err, hexList) => {
- assert.ifError(err);
- fs.readdir(dir, common.mustCall((err, stringList) => {
- assert.ifError(err);
+fs.readdir(dir, 'hex', common.mustSucceed((hexList) => {
+ fs.readdir(dir, common.mustSucceed((stringList) => {
stringList.forEach((val, idx) => {
const fromHexList = Buffer.from(hexList[idx], 'hex').toString();
assert.strictEqual(
diff --git a/test/parallel/test-fs-chmod-mask.js b/test/parallel/test-fs-chmod-mask.js
index 9564ca142bd643..bd967f5fb62578 100644
--- a/test/parallel/test-fs-chmod-mask.js
+++ b/test/parallel/test-fs-chmod-mask.js
@@ -29,8 +29,7 @@ function test(mode, asString) {
const file = path.join(tmpdir.path, `chmod-async-${suffix}.txt`);
fs.writeFileSync(file, 'test', 'utf-8');
- fs.chmod(file, input, common.mustCall((err) => {
- assert.ifError(err);
+ fs.chmod(file, input, common.mustSucceed(() => {
assert.strictEqual(fs.statSync(file).mode & 0o777, mode);
}));
}
@@ -46,11 +45,8 @@ function test(mode, asString) {
{
const file = path.join(tmpdir.path, `fchmod-async-${suffix}.txt`);
fs.writeFileSync(file, 'test', 'utf-8');
- fs.open(file, 'w', common.mustCall((err, fd) => {
- assert.ifError(err);
-
- fs.fchmod(fd, input, common.mustCall((err) => {
- assert.ifError(err);
+ fs.open(file, 'w', common.mustSucceed((fd) => {
+ fs.fchmod(fd, input, common.mustSucceed(() => {
assert.strictEqual(fs.fstatSync(fd).mode & 0o777, mode);
fs.close(fd, assert.ifError);
}));
@@ -74,8 +70,7 @@ function test(mode, asString) {
fs.writeFileSync(file, 'test', 'utf-8');
fs.symlinkSync(file, link);
- fs.lchmod(link, input, common.mustCall((err) => {
- assert.ifError(err);
+ fs.lchmod(link, input, common.mustSucceed(() => {
assert.strictEqual(fs.lstatSync(link).mode & 0o777, mode);
}));
}
diff --git a/test/parallel/test-fs-chmod.js b/test/parallel/test-fs-chmod.js
index 36e417c6c4b5e3..4056c9fc0fc092 100644
--- a/test/parallel/test-fs-chmod.js
+++ b/test/parallel/test-fs-chmod.js
@@ -80,9 +80,7 @@ const file2 = path.join(tmpdir.path, 'a1.js');
// Create file1.
fs.closeSync(fs.openSync(file1, 'w'));
-fs.chmod(file1, mode_async.toString(8), common.mustCall((err) => {
- assert.ifError(err);
-
+fs.chmod(file1, mode_async.toString(8), common.mustSucceed(() => {
if (common.isWindows) {
assert.ok((fs.statSync(file1).mode & 0o777) & mode_async);
} else {
@@ -97,12 +95,8 @@ fs.chmod(file1, mode_async.toString(8), common.mustCall((err) => {
}
}));
-fs.open(file2, 'w', common.mustCall((err, fd) => {
- assert.ifError(err);
-
- fs.fchmod(fd, mode_async.toString(8), common.mustCall((err) => {
- assert.ifError(err);
-
+fs.open(file2, 'w', common.mustSucceed((fd) => {
+ fs.fchmod(fd, mode_async.toString(8), common.mustSucceed(() => {
if (common.isWindows) {
assert.ok((fs.fstatSync(fd).mode & 0o777) & mode_async);
} else {
@@ -136,9 +130,7 @@ if (fs.lchmod) {
fs.symlinkSync(file2, link);
- fs.lchmod(link, mode_async, common.mustCall((err) => {
- assert.ifError(err);
-
+ fs.lchmod(link, mode_async, common.mustSucceed(() => {
assert.strictEqual(fs.lstatSync(link).mode & 0o777, mode_async);
fs.lchmodSync(link, mode_sync);
diff --git a/test/parallel/test-fs-copyfile.js b/test/parallel/test-fs-copyfile.js
index 97828528527852..51250d7b83145c 100644
--- a/test/parallel/test-fs-copyfile.js
+++ b/test/parallel/test-fs-copyfile.js
@@ -76,8 +76,7 @@ try {
// Copies asynchronously.
tmpdir.refresh(); // Don't use unlinkSync() since the last test may fail.
-fs.copyFile(src, dest, common.mustCall((err) => {
- assert.ifError(err);
+fs.copyFile(src, dest, common.mustSucceed(() => {
verify(src, dest);
// Copy asynchronously with flags.
diff --git a/test/parallel/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js
index a5de2ab80bcf10..7cbe4d50055ad4 100644
--- a/test/parallel/test-fs-empty-readStream.js
+++ b/test/parallel/test-fs-empty-readStream.js
@@ -27,10 +27,7 @@ const fixtures = require('../common/fixtures');
const emptyFile = fixtures.path('empty.txt');
-fs.open(emptyFile, 'r', common.mustCall((error, fd) => {
-
- assert.ifError(error);
-
+fs.open(emptyFile, 'r', common.mustSucceed((fd) => {
const read = fs.createReadStream(emptyFile, { fd });
read.once('data', common.mustNotCall('data event should not emit'));
@@ -38,10 +35,7 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => {
read.once('end', common.mustCall());
}));
-fs.open(emptyFile, 'r', common.mustCall((error, fd) => {
-
- assert.ifError(error);
-
+fs.open(emptyFile, 'r', common.mustSucceed((fd) => {
const read = fs.createReadStream(emptyFile, { fd });
read.pause();
diff --git a/test/parallel/test-fs-existssync-false.js b/test/parallel/test-fs-existssync-false.js
index 3808750d7f304a..e81e6c7a311668 100644
--- a/test/parallel/test-fs-existssync-false.js
+++ b/test/parallel/test-fs-existssync-false.js
@@ -31,6 +31,4 @@ for (let i = 0; i < 50; i++) {
assert(fs.existsSync(dir), 'Directory is not accessible');
// Test if file exists asynchronously
-fs.access(dir, common.mustCall((err) => {
- assert.ifError(err);
-}));
+fs.access(dir, common.mustSucceed());
diff --git a/test/parallel/test-fs-fsync.js b/test/parallel/test-fs-fsync.js
index 70027e33ed9e0a..c60fe0af728e39 100644
--- a/test/parallel/test-fs-fsync.js
+++ b/test/parallel/test-fs-fsync.js
@@ -35,17 +35,13 @@ const fileTemp = path.join(tmpdir.path, 'a.js');
tmpdir.refresh();
fs.copyFileSync(fileFixture, fileTemp);
-fs.open(fileTemp, 'a', 0o777, common.mustCall(function(err, fd) {
- assert.ifError(err);
-
+fs.open(fileTemp, 'a', 0o777, common.mustSucceed((fd) => {
fs.fdatasyncSync(fd);
fs.fsyncSync(fd);
- fs.fdatasync(fd, common.mustCall(function(err) {
- assert.ifError(err);
- fs.fsync(fd, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.fdatasync(fd, common.mustSucceed(() => {
+ fs.fsync(fd, common.mustSucceed(() => {
fs.closeSync(fd);
}));
}));
diff --git a/test/parallel/test-fs-lchown.js b/test/parallel/test-fs-lchown.js
index a554c8914b6f56..ba2b4b85fb9c90 100644
--- a/test/parallel/test-fs-lchown.js
+++ b/test/parallel/test-fs-lchown.js
@@ -58,8 +58,7 @@ if (!common.isWindows) {
tmpdir.refresh();
fs.copyFileSync(__filename, testFile);
fs.lchownSync(testFile, uid, gid);
- fs.lchown(testFile, uid, gid, common.mustCall(async (err) => {
- assert.ifError(err);
+ fs.lchown(testFile, uid, gid, common.mustSucceed(async (err) => {
await promises.lchown(testFile, uid, gid);
}));
}
diff --git a/test/parallel/test-fs-long-path.js b/test/parallel/test-fs-long-path.js
index 3e61c9a769e117..1cb66fa6046152 100644
--- a/test/parallel/test-fs-long-path.js
+++ b/test/parallel/test-fs-long-path.js
@@ -26,7 +26,6 @@ if (!common.isWindows)
const fs = require('fs');
const path = require('path');
-const assert = require('assert');
const tmpdir = require('../common/tmpdir');
@@ -42,10 +41,6 @@ console.log({
fullPathLength: fullPath.length
});
-fs.writeFile(fullPath, 'ok', common.mustCall(function(err) {
- assert.ifError(err);
-
- fs.stat(fullPath, common.mustCall(function(err, stats) {
- assert.ifError(err);
- }));
+fs.writeFile(fullPath, 'ok', common.mustSucceed(() => {
+ fs.stat(fullPath, common.mustSucceed());
}));
diff --git a/test/parallel/test-fs-mkdir-mode-mask.js b/test/parallel/test-fs-mkdir-mode-mask.js
index 40bd7bec441373..6e11d0fb2e36eb 100644
--- a/test/parallel/test-fs-mkdir-mode-mask.js
+++ b/test/parallel/test-fs-mkdir-mode-mask.js
@@ -31,8 +31,7 @@ function test(mode, asString) {
{
const dir = path.join(tmpdir.path, `mkdir-${suffix}`);
- fs.mkdir(dir, input, common.mustCall((err) => {
- assert.ifError(err);
+ fs.mkdir(dir, input, common.mustSucceed(() => {
assert.strictEqual(fs.statSync(dir).mode & 0o777, mode);
}));
}
diff --git a/test/parallel/test-fs-mkdir-rmdir.js b/test/parallel/test-fs-mkdir-rmdir.js
index 5e4982ba8576bf..80162934d1f399 100644
--- a/test/parallel/test-fs-mkdir-rmdir.js
+++ b/test/parallel/test-fs-mkdir-rmdir.js
@@ -25,9 +25,7 @@ fs.rmdirSync(d);
assert(!fs.existsSync(d));
// Similarly test the Async version
-fs.mkdir(d, 0o666, common.mustCall(function(err) {
- assert.ifError(err);
-
+fs.mkdir(d, 0o666, common.mustSucceed(() => {
fs.mkdir(d, 0o666, common.mustCall(function(err) {
assert.strictEqual(this, undefined);
assert.ok(err, 'got no error');
diff --git a/test/parallel/test-fs-open-flags.js b/test/parallel/test-fs-open-flags.js
index 1eb17ce5b55826..f4f96e36d3950d 100644
--- a/test/parallel/test-fs-open-flags.js
+++ b/test/parallel/test-fs-open-flags.js
@@ -89,8 +89,7 @@ if (common.isLinux || common.isOSX) {
tmpdir.refresh();
const file = path.join(tmpdir.path, 'a.js');
fs.copyFileSync(fixtures.path('a.js'), file);
- fs.open(file, O_DSYNC, common.mustCall((err, fd) => {
- assert.ifError(err);
+ fs.open(file, O_DSYNC, common.mustSucceed((fd) => {
fs.closeSync(fd);
}));
}
diff --git a/test/parallel/test-fs-open-mode-mask.js b/test/parallel/test-fs-open-mode-mask.js
index 4100fbb32c2046..bab89f98f0d1a7 100644
--- a/test/parallel/test-fs-open-mode-mask.js
+++ b/test/parallel/test-fs-open-mode-mask.js
@@ -29,8 +29,7 @@ function test(mode, asString) {
{
const file = path.join(tmpdir.path, `open-${suffix}.txt`);
- fs.open(file, 'w+', input, common.mustCall((err, fd) => {
- assert.ifError(err);
+ fs.open(file, 'w+', input, common.mustSucceed((fd) => {
assert.strictEqual(fs.fstatSync(fd).mode & 0o777, mode);
fs.closeSync(fd);
assert.strictEqual(fs.statSync(file).mode & 0o777, mode);
diff --git a/test/parallel/test-fs-open.js b/test/parallel/test-fs-open.js
index c96c435c6c33b4..bf64089bf73dfb 100644
--- a/test/parallel/test-fs-open.js
+++ b/test/parallel/test-fs-open.js
@@ -38,25 +38,15 @@ assert.strictEqual(caughtException, true);
fs.openSync(__filename);
-fs.open(__filename, common.mustCall((err) => {
- assert.ifError(err);
-}));
+fs.open(__filename, common.mustSucceed());
-fs.open(__filename, 'r', common.mustCall((err) => {
- assert.ifError(err);
-}));
+fs.open(__filename, 'r', common.mustSucceed());
-fs.open(__filename, 'rs', common.mustCall((err) => {
- assert.ifError(err);
-}));
+fs.open(__filename, 'rs', common.mustSucceed());
-fs.open(__filename, 'r', 0, common.mustCall((err) => {
- assert.ifError(err);
-}));
+fs.open(__filename, 'r', 0, common.mustSucceed());
-fs.open(__filename, 'r', null, common.mustCall((err) => {
- assert.ifError(err);
-}));
+fs.open(__filename, 'r', null, common.mustSucceed());
async function promise() {
await fs.promises.open(__filename);
diff --git a/test/parallel/test-fs-opendir.js b/test/parallel/test-fs-opendir.js
index e5233e3a10914a..ab7b24b63e76b2 100644
--- a/test/parallel/test-fs-opendir.js
+++ b/test/parallel/test-fs-opendir.js
@@ -65,8 +65,7 @@ const invalidCallbackObj = {
}
// Check the opendir async version
-fs.opendir(testDir, common.mustCall(function(err, dir) {
- assert.ifError(err);
+fs.opendir(testDir, common.mustSucceed((dir) => {
let sync = true;
dir.read(common.mustCall((err, dirent) => {
assert(!sync);
@@ -81,9 +80,7 @@ fs.opendir(testDir, common.mustCall(function(err, dir) {
assert(!syncInner);
assert.ifError(err);
- dir.close(common.mustCall(function(err) {
- assert.ifError(err);
- }));
+ dir.close(common.mustSucceed());
}));
syncInner = false;
}));
diff --git a/test/parallel/test-fs-read.js b/test/parallel/test-fs-read.js
index 2b665d8eb96ebb..531eba00d2847d 100644
--- a/test/parallel/test-fs-read.js
+++ b/test/parallel/test-fs-read.js
@@ -35,8 +35,7 @@ function test(bufferAsync, bufferSync, expected) {
0,
expected.length,
0,
- common.mustCall((err, bytesRead) => {
- assert.ifError(err);
+ common.mustSucceed((bytesRead) => {
assert.strictEqual(bytesRead, expected.length);
assert.deepStrictEqual(bufferAsync, expected);
}));
@@ -62,8 +61,7 @@ test(new Uint8Array(expected.length),
const nRead = fs.readSync(fd, Buffer.alloc(1), 0, 1, pos);
assert.strictEqual(nRead, 0);
- fs.read(fd, Buffer.alloc(1), 0, 1, pos, common.mustCall((err, nRead) => {
- assert.ifError(err);
+ fs.read(fd, Buffer.alloc(1), 0, 1, pos, common.mustSucceed((nRead) => {
assert.strictEqual(nRead, 0);
}));
}
diff --git a/test/parallel/test-fs-readdir-types.js b/test/parallel/test-fs-readdir-types.js
index 9272a61433076b..9116a04f44ed70 100644
--- a/test/parallel/test-fs-readdir-types.js
+++ b/test/parallel/test-fs-readdir-types.js
@@ -67,8 +67,7 @@ fs.readdir(__filename, {
// Check the readdir async version
fs.readdir(readdirDir, {
withFileTypes: true
-}, common.mustCall((err, dirents) => {
- assert.ifError(err);
+}, common.mustSucceed((dirents) => {
assertDirents(dirents);
}));
@@ -104,8 +103,7 @@ binding.readdir = common.mustCall((path, encoding, types, req, ctx) => {
assertDirents(fs.readdirSync(readdirDir, { withFileTypes: true }));
fs.readdir(readdirDir, {
withFileTypes: true
-}, common.mustCall((err, dirents) => {
- assert.ifError(err);
+}, common.mustSucceed((dirents) => {
assertDirents(dirents);
}));
diff --git a/test/parallel/test-fs-readdir-ucs2.js b/test/parallel/test-fs-readdir-ucs2.js
index e5b85665932a7c..264858ec6ae8da 100644
--- a/test/parallel/test-fs-readdir-ucs2.js
+++ b/test/parallel/test-fs-readdir-ucs2.js
@@ -23,8 +23,7 @@ try {
throw e;
}
-fs.readdir(tmpdir.path, 'ucs2', common.mustCall((err, list) => {
- assert.ifError(err);
+fs.readdir(tmpdir.path, 'ucs2', common.mustSucceed((list) => {
assert.strictEqual(list.length, 1);
const fn = list[0];
assert.deepStrictEqual(Buffer.from(fn, 'ucs2'), filebuff);
diff --git a/test/parallel/test-fs-readdir.js b/test/parallel/test-fs-readdir.js
index bfb88ed93fb4b3..6ae29045cdd7a3 100644
--- a/test/parallel/test-fs-readdir.js
+++ b/test/parallel/test-fs-readdir.js
@@ -21,8 +21,7 @@ files.forEach(function(currentFile) {
assert.deepStrictEqual(files, fs.readdirSync(readdirDir).sort());
// Check the readdir async version
-fs.readdir(readdirDir, common.mustCall(function(err, f) {
- assert.ifError(err);
+fs.readdir(readdirDir, common.mustSucceed((f) => {
assert.deepStrictEqual(files, f.sort());
}));
diff --git a/test/parallel/test-fs-readfile-fd.js b/test/parallel/test-fs-readfile-fd.js
index 394ce72e96892f..d7bf11c2d8d671 100644
--- a/test/parallel/test-fs-readfile-fd.js
+++ b/test/parallel/test-fs-readfile-fd.js
@@ -75,18 +75,15 @@ function tempFdSync(callback) {
{
// Tests the fs.readFile().
- fs.open(filename, 'r', common.mustCall((err, fd) => {
- assert.ifError(err);
+ fs.open(filename, 'r', common.mustSucceed((fd) => {
const buf = Buffer.alloc(5);
// Read only five bytes, so that the position moves to five.
- fs.read(fd, buf, 0, 5, null, common.mustCall((err, bytes) => {
- assert.ifError(err);
+ fs.read(fd, buf, 0, 5, null, common.mustSucceed((bytes) => {
assert.strictEqual(bytes, 5);
assert.deepStrictEqual(buf.toString(), 'Hello');
- fs.readFile(fd, common.mustCall((err, data) => {
- assert.ifError(err);
+ fs.readFile(fd, common.mustSucceed((data) => {
// readFile() should read from position five, instead of zero.
assert.deepStrictEqual(data.toString(), ' World');
diff --git a/test/parallel/test-fs-readfile-pipe-large.js b/test/parallel/test-fs-readfile-pipe-large.js
index a32e79833482a5..14a0793620b7b9 100644
--- a/test/parallel/test-fs-readfile-pipe-large.js
+++ b/test/parallel/test-fs-readfile-pipe-large.js
@@ -29,8 +29,7 @@ const exec = require('child_process').exec;
const f = JSON.stringify(__filename);
const node = JSON.stringify(process.execPath);
const cmd = `cat ${filename} | ${node} ${f} child`;
-exec(cmd, { maxBuffer: 1000000 }, common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+exec(cmd, { maxBuffer: 1000000 }, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(
stdout,
dataExpected,
diff --git a/test/parallel/test-fs-readfile-pipe.js b/test/parallel/test-fs-readfile-pipe.js
index a21801e3890894..0cffbd0f5aa162 100644
--- a/test/parallel/test-fs-readfile-pipe.js
+++ b/test/parallel/test-fs-readfile-pipe.js
@@ -31,8 +31,7 @@ const assert = require('assert');
const fs = require('fs');
if (process.argv[2] === 'child') {
- fs.readFile('/dev/stdin', common.mustCall(function(er, data) {
- assert.ifError(er);
+ fs.readFile('/dev/stdin', common.mustSucceed((data) => {
process.stdout.write(data);
}));
return;
@@ -47,8 +46,7 @@ const exec = require('child_process').exec;
const f = JSON.stringify(__filename);
const node = JSON.stringify(process.execPath);
const cmd = `cat ${filename} | ${node} ${f} child`;
-exec(cmd, common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+exec(cmd, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(
stdout,
dataExpected,
diff --git a/test/parallel/test-fs-readfile-unlink.js b/test/parallel/test-fs-readfile-unlink.js
index 3ff9b6ac9029fe..c3e70a7c4db597 100644
--- a/test/parallel/test-fs-readfile-unlink.js
+++ b/test/parallel/test-fs-readfile-unlink.js
@@ -37,8 +37,7 @@ tmpdir.refresh();
fs.writeFileSync(fileName, buf);
-fs.readFile(fileName, common.mustCall((err, data) => {
- assert.ifError(err);
+fs.readFile(fileName, common.mustSucceed((data) => {
assert.strictEqual(data.length, buf.length);
assert.strictEqual(buf[0], 42);
diff --git a/test/parallel/test-fs-readfilesync-enoent.js b/test/parallel/test-fs-readfilesync-enoent.js
index 0369f358770383..baf87ff990bc73 100644
--- a/test/parallel/test-fs-readfilesync-enoent.js
+++ b/test/parallel/test-fs-readfilesync-enoent.js
@@ -18,8 +18,7 @@ function test(p) {
const result = fs.realpathSync(p);
assert.strictEqual(result.toLowerCase(), path.resolve(p).toLowerCase());
- fs.realpath(p, common.mustCall(function(err, result) {
- assert.ok(!err);
+ fs.realpath(p, common.mustSucceed((result) => {
assert.strictEqual(result.toLowerCase(), path.resolve(p).toLowerCase());
}));
}
diff --git a/test/parallel/test-fs-readfilesync-pipe-large.js b/test/parallel/test-fs-readfilesync-pipe-large.js
index c8ea474ea7668e..7c2a5e7fd01ae3 100644
--- a/test/parallel/test-fs-readfilesync-pipe-large.js
+++ b/test/parallel/test-fs-readfilesync-pipe-large.js
@@ -29,8 +29,7 @@ const cmd = `cat ${filename} | ${node} ${f} child`;
exec(
cmd,
{ maxBuffer: 1000000 },
- common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, dataExpected);
assert.strictEqual(stderr, '');
console.log('ok');
diff --git a/test/parallel/test-fs-readv.js b/test/parallel/test-fs-readv.js
index 1fa9d80f9f2328..8cffdb29c02060 100644
--- a/test/parallel/test-fs-readv.js
+++ b/test/parallel/test-fs-readv.js
@@ -24,9 +24,7 @@ const allocateEmptyBuffers = (combinedLength) => {
};
const getCallback = (fd, bufferArr) => {
- return common.mustCall((err, bytesRead, buffers) => {
- assert.ifError(err);
-
+ return common.mustSucceed((bytesRead, buffers) => {
assert.deepStrictEqual(bufferArr, buffers);
const expectedLength = exptectedBuff.length;
assert.deepStrictEqual(bytesRead, expectedLength);
diff --git a/test/parallel/test-fs-realpath-buffer-encoding.js b/test/parallel/test-fs-realpath-buffer-encoding.js
index 6952e0c46c689e..481e1b0df67f04 100644
--- a/test/parallel/test-fs-realpath-buffer-encoding.js
+++ b/test/parallel/test-fs-realpath-buffer-encoding.js
@@ -54,45 +54,37 @@ for (encoding in expected) {
fs.realpath(
string_dir,
{ encoding },
- common.mustCall((err, res) => {
- assert.ifError(err);
+ common.mustSucceed((res) => {
assert.strictEqual(res, expected_value);
})
);
- fs.realpath(string_dir, encoding, common.mustCall((err, res) => {
- assert.ifError(err);
+ fs.realpath(string_dir, encoding, common.mustSucceed((res) => {
assert.strictEqual(res, expected_value);
}));
fs.realpath(
buffer_dir,
{ encoding },
- common.mustCall((err, res) => {
- assert.ifError(err);
+ common.mustSucceed((res) => {
assert.strictEqual(res, expected_value);
})
);
- fs.realpath(buffer_dir, encoding, common.mustCall((err, res) => {
- assert.ifError(err);
+ fs.realpath(buffer_dir, encoding, common.mustSucceed((res) => {
assert.strictEqual(res, expected_value);
}));
}
-fs.realpath(string_dir, { encoding: 'buffer' }, common.mustCall((err, res) => {
- assert.ifError(err);
+fs.realpath(string_dir, { encoding: 'buffer' }, common.mustSucceed((res) => {
assert.deepStrictEqual(res, buffer_dir);
}));
-fs.realpath(string_dir, 'buffer', common.mustCall((err, res) => {
- assert.ifError(err);
+fs.realpath(string_dir, 'buffer', common.mustSucceed((res) => {
assert.deepStrictEqual(res, buffer_dir);
}));
-fs.realpath(buffer_dir, { encoding: 'buffer' }, common.mustCall((err, res) => {
- assert.ifError(err);
+fs.realpath(buffer_dir, { encoding: 'buffer' }, common.mustSucceed((res) => {
assert.deepStrictEqual(res, buffer_dir);
}));
-fs.realpath(buffer_dir, 'buffer', common.mustCall((err, res) => {
- assert.ifError(err);
+fs.realpath(buffer_dir, 'buffer', common.mustSucceed((res) => {
assert.deepStrictEqual(res, buffer_dir);
}));
diff --git a/test/parallel/test-fs-realpath-native.js b/test/parallel/test-fs-realpath-native.js
index 089572442d62f5..d6f319a015aeaf 100644
--- a/test/parallel/test-fs-realpath-native.js
+++ b/test/parallel/test-fs-realpath-native.js
@@ -12,8 +12,7 @@ assert.strictEqual(
fs.realpath.native(
'./test/parallel/test-fs-realpath-native.js',
- common.mustCall(function(err, res) {
- assert.ifError(err);
+ common.mustSucceed(function(res) {
assert.strictEqual(res.toLowerCase(), filename);
assert.strictEqual(this, undefined);
}));
diff --git a/test/parallel/test-fs-realpath-on-substed-drive.js b/test/parallel/test-fs-realpath-on-substed-drive.js
index d5c684f33c073f..aea53f642f3eef 100644
--- a/test/parallel/test-fs-realpath-on-substed-drive.js
+++ b/test/parallel/test-fs-realpath-on-substed-drive.js
@@ -41,13 +41,11 @@ result = fs.realpathSync(filename, 'buffer');
assert(Buffer.isBuffer(result));
assert(result.equals(filenameBuffer));
-fs.realpath(filename, common.mustCall(function(err, result) {
- assert.ifError(err);
+fs.realpath(filename, common.mustSucceed((result) => {
assert.strictEqual(result, filename);
}));
-fs.realpath(filename, 'buffer', common.mustCall(function(err, result) {
- assert.ifError(err);
+fs.realpath(filename, 'buffer', common.mustSucceed((result) => {
assert(Buffer.isBuffer(result));
assert(result.equals(filenameBuffer));
}));
diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js
index f6b63370082494..04d746243bf8c5 100644
--- a/test/parallel/test-fs-realpath.js
+++ b/test/parallel/test-fs-realpath.js
@@ -564,8 +564,7 @@ function runNextTest(err) {
return console.log(`${numtests} subtests completed OK for fs.realpath`);
}
testsRun++;
- test(fs.realpath, fs.realpathSync, common.mustCall((err) => {
- assert.ifError(err);
+ test(fs.realpath, fs.realpathSync, common.mustSucceed(() => {
testsRun++;
test(fs.realpath.native,
fs.realpathSync.native,
diff --git a/test/parallel/test-fs-rm.js b/test/parallel/test-fs-rm.js
index 5db6c7f6447ef6..5bb5d2de553eee 100644
--- a/test/parallel/test-fs-rm.js
+++ b/test/parallel/test-fs-rm.js
@@ -72,8 +72,7 @@ function removeAsync(dir) {
assert.strictEqual(err.syscall, 'rm');
// Recursive removal should succeed.
- fs.rm(dir, { recursive: true }, common.mustCall((err) => {
- assert.ifError(err);
+ fs.rm(dir, { recursive: true }, common.mustSucceed(() => {
// Attempted removal should fail now because the directory is gone.
fs.rm(dir, common.mustCall((err) => {
diff --git a/test/parallel/test-fs-rmdir-recursive.js b/test/parallel/test-fs-rmdir-recursive.js
index bbf89a3959e19d..7375eeacb07177 100644
--- a/test/parallel/test-fs-rmdir-recursive.js
+++ b/test/parallel/test-fs-rmdir-recursive.js
@@ -72,13 +72,9 @@ function removeAsync(dir) {
assert.strictEqual(err.syscall, 'rmdir');
// Recursive removal should succeed.
- fs.rmdir(dir, { recursive: true }, common.mustCall((err) => {
- assert.ifError(err);
-
+ fs.rmdir(dir, { recursive: true }, common.mustSucceed(() => {
// No error should occur if recursive and the directory does not exist.
- fs.rmdir(dir, { recursive: true }, common.mustCall((err) => {
- assert.ifError(err);
-
+ fs.rmdir(dir, { recursive: true }, common.mustSucceed(() => {
// Attempted removal should fail now because the directory is gone.
fs.rmdir(dir, common.mustCall((err) => {
assert.strictEqual(err.syscall, 'rmdir');
diff --git a/test/parallel/test-fs-stat.js b/test/parallel/test-fs-stat.js
index 32acf65b7b96a3..31aec8fab00450 100644
--- a/test/parallel/test-fs-stat.js
+++ b/test/parallel/test-fs-stat.js
@@ -25,8 +25,7 @@ const common = require('../common');
const assert = require('assert');
const fs = require('fs');
-fs.stat('.', common.mustCall(function(err, stats) {
- assert.ifError(err);
+fs.stat('.', common.mustSucceed(function(stats) {
assert.ok(stats.mtime instanceof Date);
assert.ok(stats.hasOwnProperty('blksize'));
assert.ok(stats.hasOwnProperty('blocks'));
@@ -36,8 +35,7 @@ fs.stat('.', common.mustCall(function(err, stats) {
assert.strictEqual(this, undefined);
}));
-fs.lstat('.', common.mustCall(function(err, stats) {
- assert.ifError(err);
+fs.lstat('.', common.mustSucceed(function(stats) {
assert.ok(stats.mtime instanceof Date);
// Confirm that we are not running in the context of the internal binding
// layer.
@@ -46,12 +44,10 @@ fs.lstat('.', common.mustCall(function(err, stats) {
}));
// fstat
-fs.open('.', 'r', undefined, common.mustCall(function(err, fd) {
- assert.ifError(err);
+fs.open('.', 'r', undefined, common.mustSucceed(function(fd) {
assert.ok(fd);
- fs.fstat(fd, common.mustCall(function(err, stats) {
- assert.ifError(err);
+ fs.fstat(fd, common.mustSucceed(function(stats) {
assert.ok(stats.mtime instanceof Date);
fs.close(fd, assert.ifError);
// Confirm that we are not running in the context of the internal binding
@@ -70,11 +66,10 @@ fs.open('.', 'r', undefined, common.mustCall(function(err, fd) {
fs.open('.', 'r', undefined, common.mustCall(function(err, fd) {
const stats = fs.fstatSync(fd);
assert.ok(stats.mtime instanceof Date);
- fs.close(fd, common.mustCall(assert.ifError));
+ fs.close(fd, common.mustSucceed());
}));
-fs.stat(__filename, common.mustCall(function(err, s) {
- assert.ifError(err);
+fs.stat(__filename, common.mustSucceed((s) => {
assert.strictEqual(s.isDirectory(), false);
assert.strictEqual(s.isFile(), true);
assert.strictEqual(s.isSocket(), false);
diff --git a/test/parallel/test-fs-symlink-buffer-path.js b/test/parallel/test-fs-symlink-buffer-path.js
index e2cdb6bc5411e0..8cc9571258ed14 100644
--- a/test/parallel/test-fs-symlink-buffer-path.js
+++ b/test/parallel/test-fs-symlink-buffer-path.js
@@ -43,18 +43,15 @@ let fileTime;
// Refs: https://github.com/nodejs/node/issues/34514
fs.symlinkSync(Buffer.from(linkData), linkPath);
-fs.lstat(linkPath, common.mustCall(function(err, stats) {
- assert.ifError(err);
+fs.lstat(linkPath, common.mustSucceed((stats) => {
linkTime = stats.mtime.getTime();
}));
-fs.stat(linkPath, common.mustCall(function(err, stats) {
- assert.ifError(err);
+fs.stat(linkPath, common.mustSucceed((stats) => {
fileTime = stats.mtime.getTime();
}));
-fs.readlink(linkPath, common.mustCall(function(err, destination) {
- assert.ifError(err);
+fs.readlink(linkPath, common.mustSucceed((destination) => {
assert.strictEqual(destination, linkData);
}));
diff --git a/test/parallel/test-fs-symlink-dir-junction-relative.js b/test/parallel/test-fs-symlink-dir-junction-relative.js
index 308ab040488471..ec86f84b666e67 100644
--- a/test/parallel/test-fs-symlink-dir-junction-relative.js
+++ b/test/parallel/test-fs-symlink-dir-junction-relative.js
@@ -38,8 +38,7 @@ const linkData = fixtures.fixturesDir;
tmpdir.refresh();
// Test fs.symlink()
-fs.symlink(linkData, linkPath1, 'junction', common.mustCall(function(err) {
- assert.ifError(err);
+fs.symlink(linkData, linkPath1, 'junction', common.mustSucceed(() => {
verifyLink(linkPath1);
}));
diff --git a/test/parallel/test-fs-symlink-dir-junction.js b/test/parallel/test-fs-symlink-dir-junction.js
index 42d6bc1214132b..f705f0e43acfcc 100644
--- a/test/parallel/test-fs-symlink-dir-junction.js
+++ b/test/parallel/test-fs-symlink-dir-junction.js
@@ -34,19 +34,14 @@ const linkPath = path.join(tmpdir.path, 'cycles_link');
tmpdir.refresh();
-fs.symlink(linkData, linkPath, 'junction', common.mustCall(function(err) {
- assert.ifError(err);
-
- fs.lstat(linkPath, common.mustCall(function(err, stats) {
- assert.ifError(err);
+fs.symlink(linkData, linkPath, 'junction', common.mustSucceed(() => {
+ fs.lstat(linkPath, common.mustSucceed((stats) => {
assert.ok(stats.isSymbolicLink());
- fs.readlink(linkPath, common.mustCall(function(err, destination) {
- assert.ifError(err);
+ fs.readlink(linkPath, common.mustSucceed((destination) => {
assert.strictEqual(destination, linkData);
- fs.unlink(linkPath, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.unlink(linkPath, common.mustSucceed(() => {
assert(!fs.existsSync(linkPath));
assert(fs.existsSync(linkData));
}));
@@ -59,13 +54,10 @@ fs.symlink(linkData, linkPath, 'junction', common.mustCall(function(err) {
const linkData = fixtures.path('/not/exists/dir');
const linkPath = path.join(tmpdir.path, 'invalid_junction_link');
- fs.symlink(linkData, linkPath, 'junction', common.mustCall(function(err) {
- assert.ifError(err);
-
+ fs.symlink(linkData, linkPath, 'junction', common.mustSucceed(() => {
assert(!fs.existsSync(linkPath));
- fs.unlink(linkPath, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.unlink(linkPath, common.mustSucceed(() => {
assert(!fs.existsSync(linkPath));
}));
}));
diff --git a/test/parallel/test-fs-symlink-dir.js b/test/parallel/test-fs-symlink-dir.js
index 707bc5b486d723..2f88ceb41621d8 100644
--- a/test/parallel/test-fs-symlink-dir.js
+++ b/test/parallel/test-fs-symlink-dir.js
@@ -31,8 +31,7 @@ function testSync(target, path) {
}
function testAsync(target, path) {
- fs.symlink(target, path, common.mustCall((err) => {
- assert.ifError(err);
+ fs.symlink(target, path, common.mustSucceed(() => {
fs.readdirSync(path);
}));
}
@@ -53,8 +52,7 @@ for (const linkTarget of linkTargets) {
}
function testAsync(target, path) {
- fs.symlink(target, path, common.mustCall((err) => {
- assert.ifError(err);
+ fs.symlink(target, path, common.mustSucceed(() => {
assert(!fs.existsSync(path));
}));
}
diff --git a/test/parallel/test-fs-symlink-longpath.js b/test/parallel/test-fs-symlink-longpath.js
index f6824218137bf2..ac15b841df9c3a 100644
--- a/test/parallel/test-fs-symlink-longpath.js
+++ b/test/parallel/test-fs-symlink-longpath.js
@@ -15,15 +15,13 @@ fs.mkdirSync(longPath, { recursive: true });
const targetDirtectory = path.join(longPath, 'target-directory');
fs.mkdirSync(targetDirtectory);
const pathDirectory = path.join(tmpDir, 'new-directory');
-fs.symlink(targetDirtectory, pathDirectory, 'dir', common.mustCall((err) => {
- assert.ifError(err);
+fs.symlink(targetDirtectory, pathDirectory, 'dir', common.mustSucceed(() => {
assert(fs.existsSync(pathDirectory));
}));
const targetFile = path.join(longPath, 'target-file');
fs.writeFileSync(targetFile, 'data');
const pathFile = path.join(tmpDir, 'new-file');
-fs.symlink(targetFile, pathFile, common.mustCall((err) => {
- assert.ifError(err);
+fs.symlink(targetFile, pathFile, common.mustSucceed(() => {
assert(fs.existsSync(pathFile));
}));
diff --git a/test/parallel/test-fs-symlink.js b/test/parallel/test-fs-symlink.js
index 3d140865a34f33..836dfeae17016c 100644
--- a/test/parallel/test-fs-symlink.js
+++ b/test/parallel/test-fs-symlink.js
@@ -39,21 +39,16 @@ tmpdir.refresh();
const linkData = fixtures.path('/cycles/root.js');
const linkPath = path.join(tmpdir.path, 'symlink1.js');
-fs.symlink(linkData, linkPath, common.mustCall(function(err) {
- assert.ifError(err);
-
- fs.lstat(linkPath, common.mustCall(function(err, stats) {
- assert.ifError(err);
+fs.symlink(linkData, linkPath, common.mustSucceed(() => {
+ fs.lstat(linkPath, common.mustSucceed((stats) => {
linkTime = stats.mtime.getTime();
}));
- fs.stat(linkPath, common.mustCall(function(err, stats) {
- assert.ifError(err);
+ fs.stat(linkPath, common.mustSucceed((stats) => {
fileTime = stats.mtime.getTime();
}));
- fs.readlink(linkPath, common.mustCall(function(err, destination) {
- assert.ifError(err);
+ fs.readlink(linkPath, common.mustSucceed((destination) => {
assert.strictEqual(destination, linkData);
}));
}));
@@ -63,9 +58,7 @@ fs.symlink(linkData, linkPath, common.mustCall(function(err) {
const linkData = fixtures.path('/not/exists/file');
const linkPath = path.join(tmpdir.path, 'symlink2.js');
- fs.symlink(linkData, linkPath, common.mustCall(function(err) {
- assert.ifError(err);
-
+ fs.symlink(linkData, linkPath, common.mustSucceed(() => {
assert(!fs.existsSync(linkPath));
}));
}
diff --git a/test/parallel/test-fs-truncate-clear-file-zero.js b/test/parallel/test-fs-truncate-clear-file-zero.js
index 4f3dce90995d06..234e65e5803793 100644
--- a/test/parallel/test-fs-truncate-clear-file-zero.js
+++ b/test/parallel/test-fs-truncate-clear-file-zero.js
@@ -49,8 +49,7 @@ tmpdir.refresh();
fs.truncate(
filename,
5,
- common.mustCall(function(err) {
- assert.ifError(err);
+ common.mustSucceed(() => {
assert.strictEqual(fs.readFileSync(filename).toString(), '01234');
})
);
diff --git a/test/parallel/test-fs-truncate-fd.js b/test/parallel/test-fs-truncate-fd.js
index fbddbb32d5c0fc..51de2e5b91d3e8 100644
--- a/test/parallel/test-fs-truncate-fd.js
+++ b/test/parallel/test-fs-truncate-fd.js
@@ -16,8 +16,7 @@ const msg = 'Using fs.truncate with a file descriptor is deprecated.' +
common.expectWarning('DeprecationWarning', msg, 'DEP0081');
-fs.truncate(fd, 5, common.mustCall((err) => {
- assert.ok(!err);
+fs.truncate(fd, 5, common.mustSucceed(() => {
assert.strictEqual(fs.readFileSync(filename, 'utf8'), 'hello');
}));
diff --git a/test/parallel/test-fs-truncate.js b/test/parallel/test-fs-truncate.js
index c41f31376f2adb..418d56c047d4e3 100644
--- a/test/parallel/test-fs-truncate.js
+++ b/test/parallel/test-fs-truncate.js
@@ -71,9 +71,8 @@ fs.truncateSync(fd);
fs.closeSync(fd);
// Async tests
-testTruncate(common.mustCall(function(er) {
- assert.ifError(er);
- testFtruncate(common.mustCall(assert.ifError));
+testTruncate(common.mustSucceed(() => {
+ testFtruncate(common.mustSucceed());
}));
function testTruncate(cb) {
@@ -155,8 +154,7 @@ function testFtruncate(cb) {
{
const file3 = path.resolve(tmp, 'truncate-file-3.txt');
fs.writeFileSync(file3, 'Hi');
- fs.truncate(file3, 4, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.truncate(file3, 4, common.mustSucceed(() => {
assert(fs.readFileSync(file3).equals(Buffer.from('Hi\u0000\u0000')));
}));
}
@@ -166,8 +164,7 @@ function testFtruncate(cb) {
fs.writeFileSync(file4, 'Hi');
const fd = fs.openSync(file4, 'r+');
process.on('beforeExit', () => fs.closeSync(fd));
- fs.ftruncate(fd, 4, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.ftruncate(fd, 4, common.mustSucceed(() => {
assert(fs.readFileSync(file4).equals(Buffer.from('Hi\u0000\u0000')));
}));
}
@@ -221,8 +218,7 @@ function testFtruncate(cb) {
);
});
- fs.ftruncate(fd, undefined, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.ftruncate(fd, undefined, common.mustSucceed(() => {
assert(fs.readFileSync(file5).equals(Buffer.from('')));
}));
}
@@ -232,8 +228,7 @@ function testFtruncate(cb) {
fs.writeFileSync(file6, 'Hi');
const fd = fs.openSync(file6, 'r+');
process.on('beforeExit', () => fs.closeSync(fd));
- fs.ftruncate(fd, -1, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.ftruncate(fd, -1, common.mustSucceed(() => {
assert(fs.readFileSync(file6).equals(Buffer.from('')));
}));
}
@@ -241,8 +236,7 @@ function testFtruncate(cb) {
{
const file7 = path.resolve(tmp, 'truncate-file-7.txt');
fs.writeFileSync(file7, 'Hi');
- fs.truncate(file7, undefined, common.mustCall(function(err) {
- assert.ifError(err);
+ fs.truncate(file7, undefined, common.mustSucceed(() => {
assert(fs.readFileSync(file7).equals(Buffer.from('')));
}));
}
diff --git a/test/parallel/test-fs-whatwg-url.js b/test/parallel/test-fs-whatwg-url.js
index f12e3ae37ebadb..a506e5eb942a54 100644
--- a/test/parallel/test-fs-whatwg-url.js
+++ b/test/parallel/test-fs-whatwg-url.js
@@ -22,8 +22,7 @@ const url = pathToFileURL(p);
assert(url instanceof URL);
// Check that we can pass in a URL object successfully
-fs.readFile(url, common.mustCall((err, data) => {
- assert.ifError(err);
+fs.readFile(url, common.mustSucceed((data) => {
assert(Buffer.isBuffer(data));
}));
diff --git a/test/parallel/test-fs-write-buffer.js b/test/parallel/test-fs-write-buffer.js
index b2cd299bb186a7..96e26ef0afebf2 100644
--- a/test/parallel/test-fs-write-buffer.js
+++ b/test/parallel/test-fs-write-buffer.js
@@ -32,12 +32,8 @@ tmpdir.refresh();
// fs.write with all parameters provided:
{
const filename = path.join(tmpdir.path, 'write1.txt');
- fs.open(filename, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const cb = common.mustCall((err, written) => {
- assert.ifError(err);
-
+ fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => {
+ const cb = common.mustSucceed((written) => {
assert.strictEqual(written, expected.length);
fs.closeSync(fd);
@@ -52,12 +48,8 @@ tmpdir.refresh();
// fs.write with a buffer, without the length parameter:
{
const filename = path.join(tmpdir.path, 'write2.txt');
- fs.open(filename, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const cb = common.mustCall((err, written) => {
- assert.ifError(err);
-
+ fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => {
+ const cb = common.mustSucceed((written) => {
assert.strictEqual(written, 2);
fs.closeSync(fd);
@@ -72,12 +64,8 @@ tmpdir.refresh();
// fs.write with a buffer, without the offset and length parameters:
{
const filename = path.join(tmpdir.path, 'write3.txt');
- fs.open(filename, 'w', 0o644, common.mustCall(function(err, fd) {
- assert.ifError(err);
-
- const cb = common.mustCall(function(err, written) {
- assert.ifError(err);
-
+ fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => {
+ const cb = common.mustSucceed((written) => {
assert.strictEqual(written, expected.length);
fs.closeSync(fd);
@@ -92,12 +80,8 @@ tmpdir.refresh();
// fs.write with the offset passed as undefined followed by the callback:
{
const filename = path.join(tmpdir.path, 'write4.txt');
- fs.open(filename, 'w', 0o644, common.mustCall(function(err, fd) {
- assert.ifError(err);
-
- const cb = common.mustCall(function(err, written) {
- assert.ifError(err);
-
+ fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => {
+ const cb = common.mustSucceed((written) => {
assert.strictEqual(written, expected.length);
fs.closeSync(fd);
@@ -112,12 +96,8 @@ tmpdir.refresh();
// fs.write with offset and length passed as undefined followed by the callback:
{
const filename = path.join(tmpdir.path, 'write5.txt');
- fs.open(filename, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const cb = common.mustCall((err, written) => {
- assert.ifError(err);
-
+ fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => {
+ const cb = common.mustSucceed((written) => {
assert.strictEqual(written, expected.length);
fs.closeSync(fd);
@@ -132,12 +112,8 @@ tmpdir.refresh();
// fs.write with a Uint8Array, without the offset and length parameters:
{
const filename = path.join(tmpdir.path, 'write6.txt');
- fs.open(filename, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const cb = common.mustCall((err, written) => {
- assert.ifError(err);
-
+ fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => {
+ const cb = common.mustSucceed((written) => {
assert.strictEqual(written, expected.length);
fs.closeSync(fd);
@@ -152,9 +128,7 @@ tmpdir.refresh();
// fs.write with invalid offset type
{
const filename = path.join(tmpdir.path, 'write7.txt');
- fs.open(filename, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
+ fs.open(filename, 'w', 0o644, common.mustSucceed((fd) => {
assert.throws(() => {
fs.write(fd,
Buffer.from('abcd'),
diff --git a/test/parallel/test-fs-write-file-typedarrays.js b/test/parallel/test-fs-write-file-typedarrays.js
index eca22750f6f903..9b48bf9dbbafa1 100644
--- a/test/parallel/test-fs-write-file-typedarrays.js
+++ b/test/parallel/test-fs-write-file-typedarrays.js
@@ -33,11 +33,8 @@ for (const expectView of common.getArrayBufferViews(inputBuffer)) {
for (const expectView of common.getArrayBufferViews(inputBuffer)) {
console.log('Async test for ', expectView[Symbol.toStringTag]);
const file = `${filename}-${expectView[Symbol.toStringTag]}`;
- fs.writeFile(file, expectView, common.mustCall((e) => {
- assert.ifError(e);
-
- fs.readFile(file, 'utf8', common.mustCall((err, data) => {
- assert.ifError(err);
+ fs.writeFile(file, expectView, common.mustSucceed(() => {
+ fs.readFile(file, 'utf8', common.mustSucceed((data) => {
assert.strictEqual(data, inputBuffer.toString('utf8'));
}));
}));
diff --git a/test/parallel/test-fs-write-file.js b/test/parallel/test-fs-write-file.js
index 74aab1423d3a68..e80861756ab2d8 100644
--- a/test/parallel/test-fs-write-file.js
+++ b/test/parallel/test-fs-write-file.js
@@ -38,11 +38,8 @@ const s = '南越国是前203年至前111年存在于岭南地区的一个国家
'历经五代君主。南越国是岭南地区的第一个有记载的政权国家，采用封建制和郡县制并存的制度，' +
'它的建立保证了秦末乱世岭南地区社会秩序的稳定，有效的改善了岭南地区落后的政治、##济现状。\n';
-fs.writeFile(filename, s, common.mustCall(function(e) {
- assert.ifError(e);
-
- fs.readFile(filename, common.mustCall(function(e, buffer) {
- assert.ifError(e);
+fs.writeFile(filename, s, common.mustSucceed(() => {
+ fs.readFile(filename, common.mustSucceed((buffer) => {
assert.strictEqual(Buffer.byteLength(s), buffer.length);
}));
}));
@@ -51,12 +48,8 @@ fs.writeFile(filename, s, common.mustCall(function(e) {
const filename2 = join(tmpdir.path, 'test2.txt');
const buf = Buffer.from(s, 'utf8');
-fs.writeFile(filename2, buf, common.mustCall(function(e) {
- assert.ifError(e);
-
- fs.readFile(filename2, common.mustCall(function(e, buffer) {
- assert.ifError(e);
-
+fs.writeFile(filename2, buf, common.mustSucceed(() => {
+ fs.readFile(filename2, common.mustSucceed((buffer) => {
assert.strictEqual(buf.length, buffer.length);
}));
}));
@@ -64,18 +57,10 @@ fs.writeFile(filename2, buf, common.mustCall(function(e) {
// Test that writeFile accepts file descriptors.
const filename4 = join(tmpdir.path, 'test4.txt');
-fs.open(filename4, 'w+', common.mustCall(function(e, fd) {
- assert.ifError(e);
-
- fs.writeFile(fd, s, common.mustCall(function(e) {
- assert.ifError(e);
-
- fs.close(fd, common.mustCall(function(e) {
- assert.ifError(e);
-
- fs.readFile(filename4, common.mustCall(function(e, buffer) {
- assert.ifError(e);
-
+fs.open(filename4, 'w+', common.mustSucceed((fd) => {
+ fs.writeFile(fd, s, common.mustSucceed(() => {
+ fs.close(fd, common.mustSucceed(() => {
+ fs.readFile(filename4, common.mustSucceed((buffer) => {
assert.strictEqual(Buffer.byteLength(s), buffer.length);
}));
}));
diff --git a/test/parallel/test-fs-write-reuse-callback.js b/test/parallel/test-fs-write-reuse-callback.js
index 45844f836d858d..790d719b67c46b 100644
--- a/test/parallel/test-fs-write-reuse-callback.js
+++ b/test/parallel/test-fs-write-reuse-callback.js
@@ -19,8 +19,7 @@ const size = 16 * 1024;
const writes = 1000;
let done = 0;
-const ondone = common.mustCall((err) => {
- assert.ifError(err);
+const ondone = common.mustSucceed(() => {
if (++done < writes) {
if (done % 25 === 0) global.gc();
setImmediate(write);
diff --git a/test/parallel/test-fs-write.js b/test/parallel/test-fs-write.js
index a6724eac300d16..bdee397eb58dd2 100644
--- a/test/parallel/test-fs-write.js
+++ b/test/parallel/test-fs-write.js
@@ -80,11 +80,8 @@ common.allowGlobals(externalizeString, isOneByteString, x);
}
/* eslint-enable no-undef */
-fs.open(fn, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const done = common.mustCall((err, written) => {
- assert.ifError(err);
+fs.open(fn, 'w', 0o644, common.mustSucceed((fd) => {
+ const done = common.mustSucceed((written) => {
assert.strictEqual(written, Buffer.byteLength(expected));
fs.closeSync(fd);
const found = fs.readFileSync(fn, 'utf8');
@@ -92,8 +89,7 @@ fs.open(fn, 'w', 0o644, common.mustCall((err, fd) => {
assert.strictEqual(found, expected);
});
- const written = common.mustCall((err, written) => {
- assert.ifError(err);
+ const written = common.mustSucceed((written) => {
assert.strictEqual(written, 0);
fs.write(fd, expected, 0, 'utf8', done);
});
@@ -102,11 +98,8 @@ fs.open(fn, 'w', 0o644, common.mustCall((err, fd) => {
}));
const args = constants.O_CREAT | constants.O_WRONLY | constants.O_TRUNC;
-fs.open(fn2, args, 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const done = common.mustCall((err, written) => {
- assert.ifError(err);
+fs.open(fn2, args, 0o644, common.mustSucceed((fd) => {
+ const done = common.mustSucceed((written) => {
assert.strictEqual(written, Buffer.byteLength(expected));
fs.closeSync(fd);
const found = fs.readFileSync(fn2, 'utf8');
@@ -114,8 +107,7 @@ fs.open(fn2, args, 0o644, common.mustCall((err, fd) => {
assert.strictEqual(found, expected);
});
- const written = common.mustCall((err, written) => {
- assert.ifError(err);
+ const written = common.mustSucceed((written) => {
assert.strictEqual(written, 0);
fs.write(fd, expected, 0, 'utf8', done);
});
@@ -123,11 +115,8 @@ fs.open(fn2, args, 0o644, common.mustCall((err, fd) => {
fs.write(fd, '', 0, 'utf8', written);
}));
-fs.open(fn3, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const done = common.mustCall((err, written) => {
- assert.ifError(err);
+fs.open(fn3, 'w', 0o644, common.mustSucceed((fd) => {
+ const done = common.mustSucceed((written) => {
assert.strictEqual(written, Buffer.byteLength(expected));
fs.closeSync(fd);
});
@@ -135,11 +124,8 @@ fs.open(fn3, 'w', 0o644, common.mustCall((err, fd) => {
fs.write(fd, expected, done);
}));
-fs.open(fn4, 'w', 0o644, common.mustCall((err, fd) => {
- assert.ifError(err);
-
- const done = common.mustCall((err, written) => {
- assert.ifError(err);
+fs.open(fn4, 'w', 0o644, common.mustSucceed((fd) => {
+ const done = common.mustSucceed((written) => {
assert.strictEqual(written, Buffer.byteLength(expected));
fs.closeSync(fd);
});
diff --git a/test/parallel/test-fs-writefile-with-fd.js b/test/parallel/test-fs-writefile-with-fd.js
index 1b0880926c58ee..1effc519627b50 100644
--- a/test/parallel/test-fs-writefile-with-fd.js
+++ b/test/parallel/test-fs-writefile-with-fd.js
@@ -38,19 +38,14 @@ tmpdir.refresh();
const file = join(tmpdir.path, 'test1.txt');
/* Open the file descriptor. */
- fs.open(file, 'w', common.mustCall((err, fd) => {
- assert.ifError(err);
-
+ fs.open(file, 'w', common.mustSucceed((fd) => {
/* Write only five characters, so that the position moves to five. */
- fs.write(fd, 'Hello', common.mustCall((err, bytes) => {
- assert.ifError(err);
+ fs.write(fd, 'Hello', common.mustSucceed((bytes) => {
assert.strictEqual(bytes, 5);
assert.deepStrictEqual(fs.readFileSync(file).toString(), 'Hello');
/* Write some more with writeFile(). */
- fs.writeFile(fd, 'World', common.mustCall((err) => {
- assert.ifError(err);
-
+ fs.writeFile(fd, 'World', common.mustSucceed(() => {
/* New content should be written at position five, instead of zero. */
assert.deepStrictEqual(fs.readFileSync(file).toString(), 'HelloWorld');
diff --git a/test/parallel/test-fs-writev.js b/test/parallel/test-fs-writev.js
index 5a32bb7ac96081..a516f9c328f1b2 100644
--- a/test/parallel/test-fs-writev.js
+++ b/test/parallel/test-fs-writev.js
@@ -24,9 +24,7 @@ const getFileName = (i) => path.join(tmpdir.path, `writev_${i}.txt`);
const buffer = Buffer.from(expected);
const bufferArr = [buffer, buffer];
- const done = common.mustCall((err, written, buffers) => {
- assert.ifError(err);
-
+ const done = common.mustSucceed((written, buffers) => {
assert.deepStrictEqual(bufferArr, buffers);
const expectedLength = bufferArr.length * buffer.byteLength;
assert.deepStrictEqual(written, expectedLength);
@@ -46,9 +44,7 @@ const getFileName = (i) => path.join(tmpdir.path, `writev_${i}.txt`);
const buffer = Buffer.from(expected);
const bufferArr = [buffer, buffer];
- const done = common.mustCall((err, written, buffers) => {
- assert.ifError(err);
-
+ const done = common.mustSucceed((written, buffers) => {
assert.deepStrictEqual(bufferArr, buffers);
const expectedLength = bufferArr.length * buffer.byteLength;
diff --git a/test/parallel/test-http-outgoing-finish.js b/test/parallel/test-http-outgoing-finish.js
index 7464dd57ea1f31..f7931ec0dfa7e2 100644
--- a/test/parallel/test-http-outgoing-finish.js
+++ b/test/parallel/test-http-outgoing-finish.js
@@ -49,7 +49,7 @@ function write(out) {
let endCb = false;
// First, write until it gets some backpressure
- while (out.write(buf, common.mustCall())) {}
+ while (out.write(buf, common.mustSucceed())) {}
// Now end, and make sure that we don't get the 'finish' event
// before the tick where the cb gets called. We give it until
diff --git a/test/parallel/test-http-unix-socket-keep-alive.js b/test/parallel/test-http-unix-socket-keep-alive.js
index fd3c6a7b1608ff..e1a2267e5c9689 100644
--- a/test/parallel/test-http-unix-socket-keep-alive.js
+++ b/test/parallel/test-http-unix-socket-keep-alive.js
@@ -10,8 +10,7 @@ tmpdir.refresh();
server.listen(common.PIPE, common.mustCall(() =>
asyncLoop(makeKeepAliveRequest, 10, common.mustCall(() =>
- server.getConnections(common.mustCall((err, conns) => {
- assert.ifError(err);
+ server.getConnections(common.mustSucceed((conns) => {
assert.strictEqual(conns, 1);
server.close();
}))
diff --git a/test/parallel/test-http2-buffersize.js b/test/parallel/test-http2-buffersize.js
index 2a21833f1cae3a..9d7355f1a0b750 100644
--- a/test/parallel/test-http2-buffersize.js
+++ b/test/parallel/test-http2-buffersize.js
@@ -1,6 +1,6 @@
'use strict';
-const { mustCall, hasCrypto, skip } = require('../common');
+const { mustCall, mustSucceed, hasCrypto, skip } = require('../common');
if (!hasCrypto)
skip('missing crypto');
const assert = require('assert');
@@ -42,7 +42,7 @@ const { once } = require('events');
stream.on('data', () => {});
for (let i = 0; i < kTimes; i += 1) {
- stream.write(Buffer.allocUnsafe(kBufferSize), mustCall());
+ stream.write(Buffer.allocUnsafe(kBufferSize), mustSucceed());
const expectedSocketBufferSize = kBufferSize * (i + 1);
assert.strictEqual(stream.bufferSize, expectedSocketBufferSize);
}
diff --git a/test/parallel/test-http2-client-upload-reject.js b/test/parallel/test-http2-client-upload-reject.js
index 678114130e3dba..723449303129fc 100644
--- a/test/parallel/test-http2-client-upload-reject.js
+++ b/test/parallel/test-http2-client-upload-reject.js
@@ -14,9 +14,7 @@ const loc = fixtures.path('person-large.jpg');
assert(fs.existsSync(loc));
-fs.readFile(loc, common.mustCall((err, data) => {
- assert.ifError(err);
-
+fs.readFile(loc, common.mustSucceed((data) => {
const server = http2.createServer();
server.on('stream', common.mustCall((stream) => {
diff --git a/test/parallel/test-http2-client-upload.js b/test/parallel/test-http2-client-upload.js
index c5b052d2fec702..f7f170126c1557 100644
--- a/test/parallel/test-http2-client-upload.js
+++ b/test/parallel/test-http2-client-upload.js
@@ -16,8 +16,7 @@ let fileData;
assert(fs.existsSync(loc));
-fs.readFile(loc, common.mustCall((err, data) => {
- assert.ifError(err);
+fs.readFile(loc, common.mustSucceed((data) => {
fileData = data;
const server = http2.createServer();
diff --git a/test/parallel/test-http2-compat-client-upload-reject.js b/test/parallel/test-http2-compat-client-upload-reject.js
index 6e3fee2e7c2ce3..2378ef27dfa624 100644
--- a/test/parallel/test-http2-compat-client-upload-reject.js
+++ b/test/parallel/test-http2-compat-client-upload-reject.js
@@ -14,9 +14,7 @@ const loc = fixtures.path('person-large.jpg');
assert(fs.existsSync(loc));
-fs.readFile(loc, common.mustCall((err, data) => {
- assert.ifError(err);
-
+fs.readFile(loc, common.mustSucceed((data) => {
const server = http2.createServer(common.mustCall((req, res) => {
setImmediate(() => {
res.writeHead(400);
diff --git a/test/parallel/test-http2-compat-serverresponse-createpushresponse.js b/test/parallel/test-http2-compat-serverresponse-createpushresponse.js
index 731c2f8709a432..f25eab444f2dfd 100644
--- a/test/parallel/test-http2-compat-serverresponse-createpushresponse.js
+++ b/test/parallel/test-http2-compat-serverresponse-createpushresponse.js
@@ -40,8 +40,7 @@ const server = h2.createServer((request, response) => {
response.createPushResponse({
':path': '/pushed',
':method': 'GET'
- }, common.mustCall((error, push) => {
- assert.ifError(error);
+ }, common.mustSucceed((push) => {
assert.strictEqual(push.stream.id % 2, 0);
push.end(pushExpect);
response.end();
diff --git a/test/parallel/test-http2-create-client-secure-session.js b/test/parallel/test-http2-create-client-secure-session.js
index 8b2aa1c168cb5e..4303786b3e435d 100644
--- a/test/parallel/test-http2-create-client-secure-session.js
+++ b/test/parallel/test-http2-create-client-secure-session.js
@@ -73,7 +73,7 @@ function verifySecureSession(key, cert, ca, opts) {
assert.strictEqual(jsonData.servername,
opts.servername || 'localhost');
assert.strictEqual(jsonData.alpnProtocol, 'h2');
- server.close(common.mustCall());
+ server.close(common.mustSucceed());
client[kSocket].destroy();
}));
}));
diff --git a/test/parallel/test-http2-dont-lose-data.js b/test/parallel/test-http2-dont-lose-data.js
index c73208f9555044..17cb610767785b 100644
--- a/test/parallel/test-http2-dont-lose-data.js
+++ b/test/parallel/test-http2-dont-lose-data.js
@@ -11,8 +11,7 @@ const server = http2.createServer();
server.on('stream', (s) => {
assert(s.pushAllowed);
- s.pushStream({ ':path': '/file' }, common.mustCall((err, pushStream) => {
- assert.ifError(err);
+ s.pushStream({ ':path': '/file' }, common.mustSucceed((pushStream) => {
pushStream.respond();
pushStream.end('a push stream');
}));
diff --git a/test/parallel/test-http2-options-max-reserved-streams.js b/test/parallel/test-http2-options-max-reserved-streams.js
index 44c495b8330480..993bb1b7b3dfed 100644
--- a/test/parallel/test-http2-options-max-reserved-streams.js
+++ b/test/parallel/test-http2-options-max-reserved-streams.js
@@ -20,8 +20,7 @@ server.on('stream', common.mustCall((stream) => {
// The first pushStream will complete as normal
stream.pushStream({
':path': '/foobar',
- }, common.mustCall((err, pushedStream) => {
- assert.ifError(err);
+ }, common.mustSucceed((pushedStream) => {
pushedStream.respond();
pushedStream.end();
pushedStream.on('aborted', common.mustNotCall());
@@ -32,8 +31,7 @@ server.on('stream', common.mustCall((stream) => {
// being set to only 1
stream.pushStream({
':path': '/foobar',
- }, common.mustCall((err, pushedStream) => {
- assert.ifError(err);
+ }, common.mustSucceed((pushedStream) => {
pushedStream.respond();
pushedStream.on('aborted', common.mustCall());
pushedStream.on('error', common.mustNotCall());
diff --git a/test/parallel/test-http2-respond-file-error-pipe-offset.js b/test/parallel/test-http2-respond-file-error-pipe-offset.js
index b6bf4844c5200d..21fccb905d7224 100644
--- a/test/parallel/test-http2-respond-file-error-pipe-offset.js
+++ b/test/parallel/test-http2-respond-file-error-pipe-offset.js
@@ -56,4 +56,4 @@ server.listen(0, () => {
req.end();
});
-fs.writeFile(pipeName, 'Hello, world!\n', common.mustCall());
+fs.writeFile(pipeName, 'Hello, world!\n', common.mustSucceed());
diff --git a/test/parallel/test-http2-respond-file-with-pipe.js b/test/parallel/test-http2-respond-file-with-pipe.js
index d0557c2fd01e3a..30bcce46b9d232 100644
--- a/test/parallel/test-http2-respond-file-with-pipe.js
+++ b/test/parallel/test-http2-respond-file-with-pipe.js
@@ -49,8 +49,7 @@ server.listen(0, () => {
req.end();
});
-fs.open(pipeName, 'w', common.mustCall((err, fd) => {
- assert.ifError(err);
+fs.open(pipeName, 'w', common.mustSucceed((fd) => {
fs.writeSync(fd, 'Hello, world!\n');
fs.closeSync(fd);
}));
diff --git a/test/parallel/test-http2-server-close-callback.js b/test/parallel/test-http2-server-close-callback.js
index f822d8a4a92d78..5b0b8116a147fd 100644
--- a/test/parallel/test-http2-server-close-callback.js
+++ b/test/parallel/test-http2-server-close-callback.js
@@ -12,7 +12,7 @@ const server = http2.createServer();
let session;
const countdown = new Countdown(2, () => {
- server.close(common.mustCall());
+ server.close(common.mustSucceed());
session.destroy();
});
diff --git a/test/parallel/test-http2-server-push-stream.js b/test/parallel/test-http2-server-push-stream.js
index 43e0e8d9320928..7c75f66aef5e7d 100644
--- a/test/parallel/test-http2-server-push-stream.js
+++ b/test/parallel/test-http2-server-push-stream.js
@@ -14,8 +14,7 @@ server.on('stream', common.mustCall((stream, headers) => {
':scheme': 'http',
':path': '/foobar',
':authority': `localhost:${port}`,
- }, common.mustCall((err, push, headers) => {
- assert.ifError(err);
+ }, common.mustSucceed((push, headers) => {
push.respond({
'content-type': 'text/html',
':status': 200,
diff --git a/test/parallel/test-https-close.js b/test/parallel/test-https-close.js
index d9ed2ba1de90a6..29104bf2f92bd6 100644
--- a/test/parallel/test-https-close.js
+++ b/test/parallel/test-https-close.js
@@ -29,7 +29,7 @@ server.on('connection', (connection) => {
});
function shutdown() {
- server.close(common.mustCall());
+ server.close(common.mustSucceed());
for (const key in connections) {
connections[key].destroy();
diff --git a/test/parallel/test-inspector-heapdump.js b/test/parallel/test-inspector-heapdump.js
index 4520de731fa57d..33b6020ce26c1b 100644
--- a/test/parallel/test-inspector-heapdump.js
+++ b/test/parallel/test-inspector-heapdump.js
@@ -18,8 +18,7 @@ session.on('HeapProfiler.addHeapSnapshotChunk', (m) => {
chunks.push(m.params.chunk);
});
-session.post('HeapProfiler.takeHeapSnapshot', null, common.mustCall((e, r) => {
- assert.ifError(e);
+session.post('HeapProfiler.takeHeapSnapshot', null, common.mustSucceed((r) => {
assert.deepStrictEqual(r, {});
session.disconnect();
diff --git a/test/parallel/test-intl.js b/test/parallel/test-intl.js
index 4daccac79d51c3..ba803973829b8a 100644
--- a/test/parallel/test-intl.js
+++ b/test/parallel/test-intl.js
@@ -133,7 +133,7 @@ if (!common.hasIntl) {
execFile(
process.execPath, ['-p', 'new Date().toLocaleString()'],
{ env },
- common.mustCall((e) => assert.ifError(e))
+ common.mustSucceed()
);
}
@@ -144,7 +144,7 @@ if (!common.hasIntl) {
process.execPath,
['-p', 'new Intl.NumberFormat().resolvedOptions().locale'],
{ env },
- common.mustCall((e) => assert.ifError(e))
+ common.mustSucceed()
);
}
}
diff --git a/test/parallel/test-net-pingpong.js b/test/parallel/test-net-pingpong.js
index e87ee10e43df84..7fb6678fe1a897 100644
--- a/test/parallel/test-net-pingpong.js
+++ b/test/parallel/test-net-pingpong.js
@@ -39,8 +39,7 @@ function pingPongTest(port, host) {
assert.strictEqual(socket.server, server);
assert.strictEqual(
server,
- server.getConnections(common.mustCall(function(err, connections) {
- assert.ifError(err);
+ server.getConnections(common.mustSucceed((connections) => {
assert.strictEqual(connections, 1);
}))
);
diff --git a/test/parallel/test-pipe-file-to-http.js b/test/parallel/test-pipe-file-to-http.js
index 9b99ddb675de41..99f18e74d318f8 100644
--- a/test/parallel/test-pipe-file-to-http.js
+++ b/test/parallel/test-pipe-file-to-http.js
@@ -69,9 +69,7 @@ function makeRequest() {
const s = fs.ReadStream(filename);
s.pipe(req);
- s.on('close', common.mustCall((err) => {
- assert.ifError(err);
- }));
+ s.on('close', common.mustSucceed());
req.on('response', (res) => {
res.resume();
diff --git a/test/parallel/test-pipe-head.js b/test/parallel/test-pipe-head.js
index cb3d183fcdff20..1e79249c290500 100644
--- a/test/parallel/test-pipe-head.js
+++ b/test/parallel/test-pipe-head.js
@@ -10,8 +10,7 @@ const script = fixtures.path('print-10-lines.js');
const cmd = `"${nodePath}" "${script}" | head -2`;
-exec(cmd, common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+exec(cmd, common.mustSucceed((stdout, stderr) => {
const lines = stdout.split('\n');
assert.strictEqual(lines.length, 3);
}));
diff --git a/test/parallel/test-preload.js b/test/parallel/test-preload.js
index 25414d2d0a62ce..29a2c682606541 100644
--- a/test/parallel/test-preload.js
+++ b/test/parallel/test-preload.js
@@ -142,8 +142,7 @@ childProcess.exec(
// Test that preload works with -i
const interactive = childProcess.exec(
`"${nodeBinary}" ${preloadOption([fixtureD])}-i`,
- common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.ok(stdout.endsWith("> 'test'\n> "));
})
);
@@ -164,8 +163,7 @@ childProcess.exec(
childProcess.exec(
`"${nodeBinary}" ${preloadOption(['./printA.js'])} "${fixtureB}"`,
{ cwd: fixtures.fixturesDir },
- common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, 'A\nB\n');
})
);
@@ -174,8 +172,7 @@ if (common.isWindows) {
childProcess.exec(
`"${nodeBinary}" ${preloadOption(['.\\printA.js'])} "${fixtureB}"`,
{ cwd: fixtures.fixturesDir },
- common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stdout, 'A\nB\n');
})
);
diff --git a/test/parallel/test-process-redirect-warnings-env.js b/test/parallel/test-process-redirect-warnings-env.js
index 5afc5dbb302edb..678f4b0868fafc 100644
--- a/test/parallel/test-process-redirect-warnings-env.js
+++ b/test/parallel/test-process-redirect-warnings-env.js
@@ -20,8 +20,7 @@ const warnpath = path.join(tmpdir.path, 'warnings.txt');
fork(warnmod, { env: { ...process.env, NODE_REDIRECT_WARNINGS: warnpath } })
.on('exit', common.mustCall(() => {
- fs.readFile(warnpath, 'utf8', common.mustCall((err, data) => {
- assert.ifError(err);
+ fs.readFile(warnpath, 'utf8', common.mustSucceed((data) => {
assert(/\(node:\d+\) Warning: a bad practice warning/.test(data));
}));
}));
diff --git a/test/parallel/test-process-redirect-warnings.js b/test/parallel/test-process-redirect-warnings.js
index b4f55fa8345409..dd66c87e633224 100644
--- a/test/parallel/test-process-redirect-warnings.js
+++ b/test/parallel/test-process-redirect-warnings.js
@@ -20,8 +20,7 @@ const warnpath = path.join(tmpdir.path, 'warnings.txt');
fork(warnmod, { execArgv: [`--redirect-warnings=${warnpath}`] })
.on('exit', common.mustCall(() => {
- fs.readFile(warnpath, 'utf8', common.mustCall((err, data) => {
- assert.ifError(err);
+ fs.readFile(warnpath, 'utf8', common.mustSucceed((data) => {
assert(/\(node:\d+\) Warning: a bad practice warning/.test(data));
}));
}));
diff --git a/test/parallel/test-quic-client-server.js b/test/parallel/test-quic-client-server.js
index 4f2bc37fff1953..c4fec7b4c7a8cc 100644
--- a/test/parallel/test-quic-client-server.js
+++ b/test/parallel/test-quic-client-server.js
@@ -184,9 +184,7 @@ client.on('close', common.mustCall(onSocketClose.bind(client)));
assert(!stream.serverInitiated);
let data = '';
- pipeline(createReadStream(__filename), stream, common.mustCall((err) => {
- assert.ifError(err);
- }));
+ pipeline(createReadStream(__filename), stream, common.mustSucceed());
stream.setEncoding('utf8');
stream.on('blocked', common.mustNotCall());
@@ -346,9 +344,7 @@ client.on('close', common.mustCall(onSocketClose.bind(client)));
}
const stream = await req.openStream();
- pipeline(createReadStream(__filename), stream, common.mustCall((err) => {
- assert.ifError(err);
- }));
+ pipeline(createReadStream(__filename), stream, common.mustSucceed());
let data = '';
stream.resume();
stream.setEncoding('utf8');
diff --git a/test/parallel/test-quic-quicsocket-packetloss-stream-rx.js b/test/parallel/test-quic-quicsocket-packetloss-stream-rx.js
index 82f21b4ab699aa..d3730423b381cc 100644
--- a/test/parallel/test-quic-quicsocket-packetloss-stream-rx.js
+++ b/test/parallel/test-quic-quicsocket-packetloss-stream-rx.js
@@ -49,9 +49,7 @@ const countdown = new Countdown(1, () => {
debug('QuicServerSession Created');
session.on('stream', common.mustCall((stream) => {
debug('Bidirectional, Client-initiated stream %d received', stream.id);
- pipeline(stream, stream, common.mustCall((err) => {
- assert(!err);
- }));
+ pipeline(stream, stream, common.mustSucceed());
}));
}));
diff --git a/test/parallel/test-quic-quicsocket-packetloss-stream-tx.js b/test/parallel/test-quic-quicsocket-packetloss-stream-tx.js
index d811ac0af14996..d33bbf6aef30a7 100644
--- a/test/parallel/test-quic-quicsocket-packetloss-stream-tx.js
+++ b/test/parallel/test-quic-quicsocket-packetloss-stream-tx.js
@@ -49,9 +49,7 @@ const countdown = new Countdown(1, () => {
debug('QuicServerSession Created');
session.on('stream', common.mustCall((stream) => {
debug('Bidirectional, Client-initiated stream %d received', stream.id);
- pipeline(stream, stream, common.mustCall((err) => {
- assert(!err);
- }));
+ pipeline(stream, stream, common.mustSucceed());
}));
}));
diff --git a/test/parallel/test-quic-quicstream-close-early.js b/test/parallel/test-quic-quicstream-close-early.js
index 6e7b4f4379523e..b134b39e2f916c 100644
--- a/test/parallel/test-quic-quicstream-close-early.js
+++ b/test/parallel/test-quic-quicstream-close-early.js
@@ -28,7 +28,7 @@ const countdown = new Countdown(2, () => {
server.on('session', common.mustCall(async (session) => {
if (qlog) session.qlog.pipe(createWriteStream('server.qlog'));
const uni = await session.openStream({ halfOpen: true });
- uni.write('hi', common.mustCall((err) => assert(!err)));
+ uni.write('hi', common.mustSucceed());
uni.on('error', common.mustNotCall());
uni.on('data', common.mustNotCall());
uni.on('close', common.mustCall());
@@ -67,8 +67,8 @@ const countdown = new Countdown(2, () => {
}));
const stream = await req.openStream();
- stream.write('hello', common.mustCall((err) => assert(!err)));
- stream.write('there', common.mustCall((err) => assert(!err)));
+ stream.write('hello', common.mustSucceed());
+ stream.write('there', common.mustSucceed());
stream.resume();
stream.on('error', common.mustNotCall());
stream.on('end', common.mustCall());
diff --git a/test/parallel/test-quic-simple-client-migrate.js b/test/parallel/test-quic-simple-client-migrate.js
index a658bfa4bbbd2f..2aed15704a1ac6 100644
--- a/test/parallel/test-quic-simple-client-migrate.js
+++ b/test/parallel/test-quic-simple-client-migrate.js
@@ -22,7 +22,7 @@ const server = createQuicSocket({ server: options });
(async function() {
server.on('session', common.mustCall((session) => {
session.on('stream', common.mustCall(async (stream) => {
- pipeline(stream, stream, common.mustCall());
+ pipeline(stream, stream, common.mustSucceed());
(await session.openStream({ halfOpen: true }))
.end('Hello from the server');
}));
diff --git a/test/parallel/test-repl-history-perm.js b/test/parallel/test-repl-history-perm.js
index 7297689422eba1..aeca832d430978 100644
--- a/test/parallel/test-repl-history-perm.js
+++ b/test/parallel/test-repl-history-perm.js
@@ -35,9 +35,7 @@ const tmpdir = require('../common/tmpdir');
tmpdir.refresh();
const replHistoryPath = path.join(tmpdir.path, '.node_repl_history');
-const checkResults = common.mustCall(function(err, r) {
- assert.ifError(err);
-
+const checkResults = common.mustSucceed((r) => {
const stat = fs.statSync(replHistoryPath);
const fileMode = stat.mode & 0o777;
assert.strictEqual(
diff --git a/test/parallel/test-repl-save-load.js b/test/parallel/test-repl-save-load.js
index f6ecc8d4ab67e9..9807365a411c4a 100644
--- a/test/parallel/test-repl-save-load.js
+++ b/test/parallel/test-repl-save-load.js
@@ -61,8 +61,7 @@ assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),
testFile.join('\n'));
// Make sure that the REPL data is "correct".
-testMe.complete('inner.o', common.mustCall(function(error, data) {
- assert.ifError(error);
+testMe.complete('inner.o', common.mustSucceed((data) => {
assert.deepStrictEqual(data, works);
}));
@@ -73,8 +72,7 @@ putIn.run(['.clear']);
putIn.run([`.load ${saveFileName}`]);
// Make sure that the REPL data is "correct".
-testMe.complete('inner.o', common.mustCall(function(error, data) {
- assert.ifError(error);
+testMe.complete('inner.o', common.mustSucceed((data) => {
assert.deepStrictEqual(data, works);
}));
diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
index 564867af5b368d..6f5cbe2becd5f7 100644
--- a/test/parallel/test-repl-tab-complete.js
+++ b/test/parallel/test-repl-tab-complete.js
@@ -44,8 +44,7 @@ process.chdir(fixtures.fixturesDir);
const repl = require('repl');
function getNoResultsFunction() {
- return common.mustCall((err, data) => {
- assert.ifError(err);
+ return common.mustSucceed((data) => {
assert.deepStrictEqual(data[0], []);
});
}
@@ -204,8 +203,7 @@ const spaceTimeout = setTimeout(function() {
throw new Error('timeout');
}, 1000);
-testMe.complete(' ', common.mustCall(function(error, data) {
- assert.ifError(error);
+testMe.complete(' ', common.mustSucceed((data) => {
assert.strictEqual(data[1], '');
assert.ok(data[0].includes('globalThis'));
clearTimeout(spaceTimeout);
@@ -343,8 +341,7 @@ testMe.complete("require\t( 'n", common.mustCall(function(error, data) {
{
const path = '../fixtures/repl-folder-extensions/f';
- testMe.complete(`require('${path}`, common.mustCall((err, data) => {
- assert.ifError(err);
+ testMe.complete(`require('${path}`, common.mustSucceed((data) => {
assert.strictEqual(data.length, 2);
assert.strictEqual(data[1], path);
assert.ok(data[0].includes('../fixtures/repl-folder-extensions/foo.js'));
diff --git a/test/parallel/test-repl-use-global.js b/test/parallel/test-repl-use-global.js
index 00222608deca6f..4ac38304601c0d 100644
--- a/test/parallel/test-repl-use-global.js
+++ b/test/parallel/test-repl-use-global.js
@@ -29,8 +29,7 @@ const globalTest = (useGlobal, cb, output) => (err, repl) => {
// Test how the global object behaves in each state for useGlobal
for (const [option, expected] of globalTestCases) {
- runRepl(option, globalTest, common.mustCall((err, output) => {
- assert.ifError(err);
+ runRepl(option, globalTest, common.mustSucceed((output) => {
assert.strictEqual(output, expected);
}));
}
@@ -58,8 +57,7 @@ const processTest = (useGlobal, cb, output) => (err, repl) => {
};
for (const option of processTestCases) {
- runRepl(option, processTest, common.mustCall((err, output) => {
- assert.ifError(err);
+ runRepl(option, processTest, common.mustSucceed((output) => {
assert.strictEqual(output, 'undefined\n42');
}));
}
diff --git a/test/parallel/test-setproctitle.js b/test/parallel/test-setproctitle.js
index ee146428a98f46..46288e8156edde 100644
--- a/test/parallel/test-setproctitle.js
+++ b/test/parallel/test-setproctitle.js
@@ -34,8 +34,7 @@ const cmd = common.isLinux ?
`ps -o pid,args | grep '${process.pid} ${title}' | grep -v grep` :
`ps -p ${process.pid} -o args=`;
-exec(cmd, common.mustCall((error, stdout, stderr) => {
- assert.ifError(error);
+exec(cmd, common.mustSucceed((stdout, stderr) => {
assert.strictEqual(stderr, '');
// Freebsd always add ' (procname)' to the process title
diff --git a/test/parallel/test-stdout-to-file.js b/test/parallel/test-stdout-to-file.js
index f23bbea279d324..014a304d3f0263 100644
--- a/test/parallel/test-stdout-to-file.js
+++ b/test/parallel/test-stdout-to-file.js
@@ -23,8 +23,7 @@ function test(size, useBuffer, cb) {
console.log(`${size} chars to ${tmpFile}...`);
- childProcess.exec(cmd, common.mustCall(function(err) {
- assert.ifError(err);
+ childProcess.exec(cmd, common.mustSucceed(() => {
console.log('done!');
const stat = fs.statSync(tmpFile);
diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
index baf594c9d2f9a6..7dc26dcbeb6afa 100644
--- a/test/parallel/test-stream-finished.js
+++ b/test/parallel/test-stream-finished.js
@@ -20,9 +20,7 @@ const http = require('http');
read() {}
});
- finished(rs, common.mustCall((err) => {
- assert(!err, 'no error');
- }));
+ finished(rs, common.mustSucceed());
rs.push(null);
rs.resume();
@@ -35,9 +33,7 @@ const http = require('http');
}
});
- finished(ws, common.mustCall((err) => {
- assert(!err, 'no error');
- }));
+ finished(ws, common.mustSucceed());
ws.end();
}
@@ -60,8 +56,7 @@ const http = require('http');
finish = true;
});
- finished(tr, common.mustCall((err) => {
- assert(!err, 'no error');
+ finished(tr, common.mustSucceed(() => {
assert(finish);
assert(ended);
}));
@@ -108,9 +103,7 @@ const http = require('http');
{
const rs = new Readable();
- finished(rs, common.mustCall((err) => {
- assert(!err, 'no error');
- }));
+ finished(rs, common.mustSucceed());
rs.push(null);
rs.emit('close'); // Should not trigger an error
diff --git a/test/parallel/test-stream-pipeline-process.js b/test/parallel/test-stream-pipeline-process.js
index 825b4454918ddc..bd17b31eed4564 100644
--- a/test/parallel/test-stream-pipeline-process.js
+++ b/test/parallel/test-stream-pipeline-process.js
@@ -9,9 +9,7 @@ if (process.argv[2] === 'child') {
pipeline(
process.stdin,
process.stdout,
- common.mustCall((err) => {
- assert.ifError(err);
- })
+ common.mustSucceed()
);
} else {
const cp = require('child_process');
@@ -22,8 +20,7 @@ if (process.argv[2] === 'child') {
`"${process.execPath}"`,
`"${__filename}"`,
'child'
- ].join(' '), common.mustCall((err, stdout) => {
- assert.ifError(err);
+ ].join(' '), common.mustSucceed((stdout) => {
assert.strictEqual(stdout.split(os.EOL).shift().trim(), 'hello');
}));
}
diff --git a/test/parallel/test-stream-pipeline-uncaught.js b/test/parallel/test-stream-pipeline-uncaught.js
index 90d141ec44fef1..35b67c4ff0afb8 100644
--- a/test/parallel/test-stream-pipeline-uncaught.js
+++ b/test/parallel/test-stream-pipeline-uncaught.js
@@ -19,7 +19,6 @@ pipeline(s, async function(source) {
for await (const chunk of source) {
chunk;
}
-}, common.mustCall((err) => {
- assert.ifError(err);
+}, common.mustSucceed(() => {
throw new Error('error');
}));
diff --git a/test/parallel/test-stream-pipeline.js b/test/parallel/test-stream-pipeline.js
index 5d3f34f51e85be..b7d3720d0d05dd 100644
--- a/test/parallel/test-stream-pipeline.js
+++ b/test/parallel/test-stream-pipeline.js
@@ -44,8 +44,7 @@ const net = require('net');
}
read.push(null);
- pipeline(read, write, common.mustCall((err) => {
- assert.ok(!err, 'no error');
+ pipeline(read, write, common.mustSucceed(() => {
assert.ok(finished);
assert.deepStrictEqual(processed, expected);
}));
@@ -255,7 +254,7 @@ const net = require('net');
{
const server = http.createServer((req, res) => {
- pipeline(req, res, common.mustCall());
+ pipeline(req, res, common.mustSucceed());
});
server.listen(0, () => {
@@ -376,8 +375,7 @@ const net = require('net');
rs,
oldStream,
ws,
- common.mustCall((err) => {
- assert(!err, 'no error');
+ common.mustSucceed(() => {
assert(finished, 'last stream finished');
})
);
@@ -528,8 +526,7 @@ const net = require('net');
pipeline(function*() {
yield 'hello';
yield 'world';
- }(), w, common.mustCall((err) => {
- assert.ok(!err);
+ }(), w, common.mustSucceed(() => {
assert.strictEqual(res, 'helloworld');
}));
}
@@ -546,8 +543,7 @@ const net = require('net');
await Promise.resolve();
yield 'hello';
yield 'world';
- }(), w, common.mustCall((err) => {
- assert.ok(!err);
+ }(), w, common.mustSucceed(() => {
assert.strictEqual(res, 'helloworld');
}));
}
@@ -563,8 +559,7 @@ const net = require('net');
pipeline(function*() {
yield 'hello';
yield 'world';
- }, w, common.mustCall((err) => {
- assert.ok(!err);
+ }, w, common.mustSucceed(() => {
assert.strictEqual(res, 'helloworld');
}));
}
@@ -581,8 +576,7 @@ const net = require('net');
await Promise.resolve();
yield 'hello';
yield 'world';
- }, w, common.mustCall((err) => {
- assert.ok(!err);
+ }, w, common.mustSucceed(() => {
assert.strictEqual(res, 'helloworld');
}));
}
@@ -601,8 +595,7 @@ const net = require('net');
for await (const chunk of source) {
res += chunk;
}
- }, common.mustCall((err) => {
- assert.ok(!err);
+ }, common.mustSucceed(() => {
assert.strictEqual(res, 'HELLOWORLD');
}));
}
@@ -622,8 +615,7 @@ const net = require('net');
ret += chunk;
}
return ret;
- }, common.mustCall((err, val) => {
- assert.ok(!err);
+ }, common.mustSucceed((val) => {
assert.strictEqual(val, 'HELLOWORLD');
}));
}
@@ -895,8 +887,7 @@ const net = require('net');
for await (const chunk of source) {
res += chunk;
}
- }, common.mustCall((err) => {
- assert.ok(!err);
+ }, common.mustSucceed(() => {
assert.strictEqual(res, 'HELLOWORLD');
}));
}
@@ -954,8 +945,7 @@ const net = require('net');
pipeline(
body,
req,
- common.mustCall((err) => {
- assert(!err);
+ common.mustSucceed(() => {
assert(!req.res);
assert(!req.aborted);
req.abort();
@@ -969,8 +959,7 @@ const net = require('net');
{
const src = new PassThrough();
const dst = new PassThrough();
- pipeline(src, dst, common.mustCall((err) => {
- assert(!err);
+ pipeline(src, dst, common.mustSucceed(() => {
assert.strictEqual(dst.destroyed, false);
}));
src.end();
@@ -980,8 +969,7 @@ const net = require('net');
const src = new PassThrough();
const dst = new PassThrough();
dst.readable = false;
- pipeline(src, dst, common.mustCall((err) => {
- assert(!err);
+ pipeline(src, dst, common.mustSucceed(() => {
assert.strictEqual(dst.destroyed, false);
}));
src.end();
@@ -1075,9 +1063,7 @@ const net = require('net');
for await (const chunk of source) {
yield { chunk };
}
- }, common.mustCall((err) => {
- assert.ifError(err);
- }));
+ }, common.mustSucceed());
}
{
@@ -1123,7 +1109,7 @@ const net = require('net');
{
const server = net.createServer(common.mustCall((socket) => {
// echo server
- pipeline(socket, socket, common.mustCall());
+ pipeline(socket, socket, common.mustSucceed());
// 13 force destroys the socket before it has a chance to emit finish
socket.on('finish', common.mustCall(() => {
server.close();
@@ -1159,7 +1145,7 @@ const net = require('net');
})
});
- pipeline(d, sink, common.mustCall());
+ pipeline(d, sink, common.mustSucceed());
d.write('test');
d.end();
@@ -1168,7 +1154,7 @@ const net = require('net');
{
const server = net.createServer(common.mustCall((socket) => {
// echo server
- pipeline(socket, socket, common.mustCall());
+ pipeline(socket, socket, common.mustSucceed());
socket.on('finish', common.mustCall(() => {
server.close();
}));
@@ -1206,7 +1192,7 @@ const net = require('net');
})
});
- pipeline(d, sink, common.mustCall());
+ pipeline(d, sink, common.mustSucceed());
d.write('test');
d.end();
@@ -1226,8 +1212,7 @@ const net = require('net');
callback();
}
});
- pipeline([r, w], common.mustCall((err) => {
- assert.ok(!err);
+ pipeline([r, w], common.mustSucceed(() => {
assert.strictEqual(res, 'helloworld');
}));
}
diff --git a/test/parallel/test-tls-addca.js b/test/parallel/test-tls-addca.js
index 8eb88db6291457..5ca44f7a26e7db 100644
--- a/test/parallel/test-tls-addca.js
+++ b/test/parallel/test-tls-addca.js
@@ -43,8 +43,7 @@ connect({
connect({
client: clientOptions,
server: serverOptions,
- }, common.mustCall((err, pair, cleanup) => {
- assert.ifError(err);
+ }, common.mustSucceed((pair, cleanup) => {
cleanup();
}));
}));
diff --git a/test/parallel/test-tls-ca-concat.js b/test/parallel/test-tls-ca-concat.js
index efec4e649c9506..38a6a4dfec378f 100644
--- a/test/parallel/test-tls-ca-concat.js
+++ b/test/parallel/test-tls-ca-concat.js
@@ -6,7 +6,7 @@ const fixtures = require('../common/fixtures');
// non-CA cert and showing that agent6's CA root is still found.
const {
- assert, connect, keys
+ connect, keys
} = require(fixtures.path('tls-connect'));
connect({
@@ -18,7 +18,6 @@ connect({
cert: keys.agent6.cert,
key: keys.agent6.key,
},
-}, common.mustCall((err, pair, cleanup) => {
- assert.ifError(err);
+}, common.mustSucceed((pair, cleanup) => {
return cleanup();
}));
diff --git a/test/parallel/test-tls-cert-chains-concat.js b/test/parallel/test-tls-cert-chains-concat.js
index a099f9ce332cb0..c186f0f6c4e4b1 100644
--- a/test/parallel/test-tls-cert-chains-concat.js
+++ b/test/parallel/test-tls-cert-chains-concat.js
@@ -19,9 +19,7 @@ connect({
cert: keys.agent6.cert,
key: keys.agent6.key,
},
-}, common.mustCall((err, pair, cleanup) => {
- assert.ifError(err);
-
+}, common.mustSucceed((pair, cleanup) => {
const peer = pair.client.conn.getPeerCertificate();
debug('peer:\n', peer);
assert.strictEqual(peer.subject.emailAddress, 'adam.lippai@tresorit.com');
diff --git a/test/parallel/test-tls-client-getephemeralkeyinfo.js b/test/parallel/test-tls-client-getephemeralkeyinfo.js
index 599306993e1252..73ac215102ddbb 100644
--- a/test/parallel/test-tls-client-getephemeralkeyinfo.js
+++ b/test/parallel/test-tls-client-getephemeralkeyinfo.js
@@ -35,9 +35,7 @@ function test(size, type, name, cipher) {
conn.end();
}));
- server.on('close', common.mustCall((err) => {
- assert.ifError(err);
- }));
+ server.on('close', common.mustSucceed());
server.listen(0, '127.0.0.1', common.mustCall(() => {
const client = tls.connect({
diff --git a/test/parallel/test-tls-disable-renegotiation.js b/test/parallel/test-tls-disable-renegotiation.js
index 926e2b8a03e49e..f720eec6c6448a 100644
--- a/test/parallel/test-tls-disable-renegotiation.js
+++ b/test/parallel/test-tls-disable-renegotiation.js
@@ -73,8 +73,7 @@ server.listen(0, common.mustCall(() => {
// Negotiation is still permitted for this first
// attempt. This should succeed.
- let ok = client.renegotiate(options, common.mustCall((err) => {
- assert.ifError(err);
+ let ok = client.renegotiate(options, common.mustSucceed(() => {
// Once renegotiation completes, we write some
// data to the socket, which triggers the on
// data event on the server. After that data
diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js
index 23767be92cf00c..c0d2625a9a6168 100644
--- a/test/parallel/test-tls-ecdh.js
+++ b/test/parallel/test-tls-ecdh.js
@@ -51,8 +51,7 @@ server.listen(0, '127.0.0.1', common.mustCall(function() {
const cmd = `"${common.opensslCli}" s_client -cipher ${
options.ciphers} -connect 127.0.0.1:${this.address().port}`;
- exec(cmd, common.mustCall(function(err, stdout, stderr) {
- assert.ifError(err);
+ exec(cmd, common.mustSucceed((stdout, stderr) => {
assert(stdout.includes(reply));
server.close();
}));
diff --git a/test/parallel/test-trace-events-api.js b/test/parallel/test-trace-events-api.js
index e45f374bab642c..344c2ae47375c9 100644
--- a/test/parallel/test-trace-events-api.js
+++ b/test/parallel/test-trace-events-api.js
@@ -149,8 +149,7 @@ function testApiInChildProcess(execArgs, cb) {
const file = path.join(tmpdir.path, 'node_trace.1.log');
assert(fs.existsSync(file));
- fs.readFile(file, common.mustCall((err, data) => {
- assert.ifError(err);
+ fs.readFile(file, common.mustSucceed((data) => {
const traces = JSON.parse(data.toString()).traceEvents
.filter((trace) => trace.cat !== '__metadata');
assert.strictEqual(traces.length,
diff --git a/test/parallel/test-util-callbackify.js b/test/parallel/test-util-callbackify.js
index eb2b3a383b9a53..73234e71b7ce49 100644
--- a/test/parallel/test-util-callbackify.js
+++ b/test/parallel/test-util-callbackify.js
@@ -32,8 +32,7 @@ const values = [
}
const cbAsyncFn = callbackify(asyncFn);
- cbAsyncFn(common.mustCall((err, ret) => {
- assert.ifError(err);
+ cbAsyncFn(common.mustSucceed((ret) => {
assert.strictEqual(ret, value);
}));
@@ -43,8 +42,7 @@ const values = [
}
const cbPromiseFn = callbackify(promiseFn);
- cbPromiseFn(common.mustCall((err, ret) => {
- assert.ifError(err);
+ cbPromiseFn(common.mustSucceed((ret) => {
assert.strictEqual(ret, value);
}));
@@ -58,8 +56,7 @@ const values = [
}
const cbThenableFn = callbackify(thenableFn);
- cbThenableFn(common.mustCall((err, ret) => {
- assert.ifError(err);
+ cbThenableFn(common.mustSucceed((ret) => {
assert.strictEqual(ret, value);
}));
}
@@ -162,8 +159,7 @@ const values = [
Object.getPrototypeOf(asyncFn)
);
assert.strictEqual(Object.getPrototypeOf(cbAsyncFn), Function.prototype);
- cbAsyncFn(value, common.mustCall((err, ret) => {
- assert.ifError(err);
+ cbAsyncFn(value, common.mustSucceed((ret) => {
assert.strictEqual(ret, value);
}));
@@ -181,8 +177,7 @@ const values = [
const cbPromiseFn = callbackify(promiseFn);
assert.strictEqual(promiseFn.length, obj);
- cbPromiseFn(value, common.mustCall((err, ret) => {
- assert.ifError(err);
+ cbPromiseFn(value, common.mustSucceed((ret) => {
assert.strictEqual(ret, value);
}));
}
@@ -198,8 +193,7 @@ const values = [
},
};
iAmThis.cbFn = callbackify(iAmThis.fn);
- iAmThis.cbFn(value, common.mustCall(function(err, ret) {
- assert.ifError(err);
+ iAmThis.cbFn(value, common.mustSucceed(function(ret) {
assert.strictEqual(ret, value);
assert.strictEqual(this, iAmThis);
}));
@@ -211,8 +205,7 @@ const values = [
},
};
iAmThat.cbFn = callbackify(iAmThat.fn);
- iAmThat.cbFn(value, common.mustCall(function(err, ret) {
- assert.ifError(err);
+ iAmThat.cbFn(value, common.mustSucceed(function(ret) {
assert.strictEqual(ret, value);
assert.strictEqual(this, iAmThat);
}));
@@ -242,8 +235,7 @@ const values = [
execFile(
process.execPath,
[fixture],
- common.mustCall((err, stdout, stderr) => {
- assert.ifError(err);
+ common.mustSucceed((stdout, stderr) => {
assert.strictEqual(
stdout.trim(),
`ifError got unwanted exception: ${fixture}`);
diff --git a/test/parallel/test-worker-no-stdin-stdout-interaction.js b/test/parallel/test-worker-no-stdin-stdout-interaction.js
index 6febbd07b566fa..77c0feecdaca08 100644
--- a/test/parallel/test-worker-no-stdin-stdout-interaction.js
+++ b/test/parallel/test-worker-no-stdin-stdout-interaction.js
@@ -15,6 +15,6 @@ if (isMainThread) {
process.stdin.on('data', () => {});
for (let i = 0; i < 10; ++i) {
- process.stdout.write(`processing(${i})\n`, common.mustCall());
+ process.stdout.write(`processing(${i})\n`, common.mustSucceed());
}
}
diff --git a/test/parallel/test-zlib-from-concatenated-gzip.js b/test/parallel/test-zlib-from-concatenated-gzip.js
index 7bb31c0f9ddd9f..cb9b5dd34c9f44 100644
--- a/test/parallel/test-zlib-from-concatenated-gzip.js
+++ b/test/parallel/test-zlib-from-concatenated-gzip.js
@@ -20,13 +20,11 @@ const data = Buffer.concat([
assert.strictEqual(zlib.gunzipSync(data).toString(), (abc + def));
-zlib.gunzip(data, common.mustCall((err, result) => {
- assert.ifError(err);
+zlib.gunzip(data, common.mustSucceed((result) => {
assert.strictEqual(result.toString(), (abc + def));
}));
-zlib.unzip(data, common.mustCall((err, result) => {
- assert.ifError(err);
+zlib.unzip(data, common.mustSucceed((result) => {
assert.strictEqual(result.toString(), (abc + def));
}));
@@ -34,8 +32,7 @@ zlib.unzip(data, common.mustCall((err, result) => {
zlib.unzip(Buffer.concat([
zlib.deflateSync('abc'),
zlib.deflateSync('def')
-]), common.mustCall((err, result) => {
- assert.ifError(err);
+]), common.mustSucceed((result) => {
assert.strictEqual(result.toString(), abc);
}));
diff --git a/test/parallel/test-zlib-from-gzip-with-trailing-garbage.js b/test/parallel/test-zlib-from-gzip-with-trailing-garbage.js
index 06fc2258a0395c..14909f4cafcb08 100644
--- a/test/parallel/test-zlib-from-gzip-with-trailing-garbage.js
+++ b/test/parallel/test-zlib-from-gzip-with-trailing-garbage.js
@@ -14,8 +14,7 @@ let data = Buffer.concat([
assert.strictEqual(zlib.gunzipSync(data).toString(), 'abcdef');
-zlib.gunzip(data, common.mustCall((err, result) => {
- assert.ifError(err);
+zlib.gunzip(data, common.mustSucceed((result) => {
assert.strictEqual(
result.toString(),
'abcdef',
diff --git a/test/sequential/test-init.js b/test/sequential/test-init.js
index a86a1fd045f48c..b64fb23daeabc7 100644
--- a/test/sequential/test-init.js
+++ b/test/sequential/test-init.js
@@ -36,8 +36,7 @@ process.env.TEST_INIT = 1;
function test(file, expected) {
const path = `"${process.execPath}" ${file}`;
- child.exec(path, { env: process.env }, common.mustCall((err, out) => {
- assert.ifError(err);
+ child.exec(path, { env: process.env }, common.mustSucceed((out) => {
assert.strictEqual(out, expected, `'node ${file}' failed!`);
}));
}
diff --git a/tools/eslint-rules/prefer-common-mustsucceed.js b/tools/eslint-rules/prefer-common-mustsucceed.js
new file mode 100644
index 00000000000000..433e8c7610f253
--- /dev/null
+++ b/tools/eslint-rules/prefer-common-mustsucceed.js
@@ -0,0 +1,66 @@
+'use strict';
+
+const mustCall = 'CallExpression[callee.object.name="common"]' +
+ '[callee.property.name="mustCall"]';
+
+module.exports = (context) => {
+ function isAssertIfError(node) {
+ return node.type === 'MemberExpression' &&
+ node.object.type === 'Identifier' &&
+ node.object.name === 'assert' &&
+ node.property.type === 'Identifier' &&
+ node.property.name === 'ifError';
+ }
+
+ function isCallToIfError(node, errName) {
+ return node.type === 'CallExpression' &&
+ isAssertIfError(node.callee) &&
+ node.arguments.length > 0 &&
+ node.arguments[0].type === 'Identifier' &&
+ node.arguments[0].name === errName;
+ }
+
+ function bodyStartsWithCallToIfError(body, errName) {
+ while (body.type === 'BlockStatement' && body.body.length > 0)
+ body = body.body[0];
+
+ let expr;
+ switch (body.type) {
+ case 'ReturnStatement':
+ expr = body.argument;
+ break;
+ case 'ExpressionStatement':
+ expr = body.expression;
+ break;
+ default:
+ expr = body;
+ }
+
+ return isCallToIfError(expr, errName);
+ }
+
+ return {
+ [`${mustCall}:exit`]: (mustCall) => {
+ if (mustCall.arguments.length > 0) {
+ const callback = mustCall.arguments[0];
+ if (isAssertIfError(callback)) {
+ context.report(mustCall, 'Please use common.mustSucceed instead of ' +
+ 'common.mustCall(assert.ifError).');
+ }
+
+ if (callback.type === 'ArrowFunctionExpression' ||
+ callback.type === 'FunctionExpression') {
+ if (callback.params.length > 0 &&
+ callback.params[0].type === 'Identifier') {
+ const errName = callback.params[0].name;
+ if (bodyStartsWithCallToIfError(callback.body, errName)) {
+ context.report(mustCall, 'Please use common.mustSucceed instead' +
+ ' of common.mustCall with' +
+ ' assert.ifError.');
+ }
+ }
+ }
+ }
+ }
+ };
+};