mirror of
https://github.com/zebrajr/node.git
synced 2026-01-15 12:15:26 +00:00
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>
This commit is contained in:
committed by
Antoine du Hamel
parent
eeb6b473fd
commit
30fb4a015d
@@ -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();
|
||||
}));
|
||||
|
||||
@@ -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();
|
||||
})
|
||||
|
||||
@@ -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();
|
||||
})
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user