24
24
const common = require ( '../common' ) ;
25
25
const { addresses } = require ( '../common/internet' ) ;
26
26
const { internalBinding } = require ( 'internal/test/binding' ) ;
27
+ const { getSystemErrorName } = require ( 'util' ) ;
27
28
const assert = require ( 'assert' ) ;
28
29
const dns = require ( 'dns' ) ;
29
30
const net = require ( 'net' ) ;
@@ -71,7 +72,10 @@ function checkWrap(req) {
71
72
TEST ( function test_reverse_bogus ( done ) {
72
73
dnsPromises . reverse ( 'bogus ip' )
73
74
. then ( common . mustNotCall ( ) )
74
- . catch ( common . expectsError ( { errno : 'EINVAL' } ) ) ;
75
+ . catch ( common . mustCall ( ( err ) => {
76
+ assert . strictEqual ( err . code , 'EINVAL' ) ;
77
+ assert . strictEqual ( getSystemErrorName ( err . errno ) , 'EINVAL' ) ;
78
+ } ) ) ;
75
79
76
80
assert . throws ( ( ) => {
77
81
dns . reverse ( 'bogus ip' , common . mustNotCall ( ) ) ;
@@ -161,11 +165,13 @@ TEST(async function test_resolveMx(done) {
161
165
TEST ( function test_resolveMx_failure ( done ) {
162
166
dnsPromises . resolveMx ( addresses . INVALID_HOST )
163
167
. then ( common . mustNotCall ( ) )
164
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
168
+ . catch ( common . mustCall ( ( err ) => {
169
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
170
+ } ) ) ;
165
171
166
172
const req = dns . resolveMx ( addresses . INVALID_HOST , function ( err , result ) {
167
173
assert . ok ( err instanceof Error ) ;
168
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
174
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
169
175
170
176
assert . strictEqual ( result , undefined ) ;
171
177
@@ -199,11 +205,13 @@ TEST(async function test_resolveNs(done) {
199
205
TEST ( function test_resolveNs_failure ( done ) {
200
206
dnsPromises . resolveNs ( addresses . INVALID_HOST )
201
207
. then ( common . mustNotCall ( ) )
202
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
208
+ . catch ( common . mustCall ( ( err ) => {
209
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
210
+ } ) ) ;
203
211
204
212
const req = dns . resolveNs ( addresses . INVALID_HOST , function ( err , result ) {
205
213
assert . ok ( err instanceof Error ) ;
206
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
214
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
207
215
208
216
assert . strictEqual ( result , undefined ) ;
209
217
@@ -241,11 +249,13 @@ TEST(async function test_resolveSrv(done) {
241
249
TEST ( function test_resolveSrv_failure ( done ) {
242
250
dnsPromises . resolveSrv ( addresses . INVALID_HOST )
243
251
. then ( common . mustNotCall ( ) )
244
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
252
+ . catch ( common . mustCall ( ( err ) => {
253
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
254
+ } ) ) ;
245
255
246
256
const req = dns . resolveSrv ( addresses . INVALID_HOST , function ( err , result ) {
247
257
assert . ok ( err instanceof Error ) ;
248
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
258
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
249
259
250
260
assert . strictEqual ( result , undefined ) ;
251
261
@@ -279,11 +289,13 @@ TEST(async function test_resolvePtr(done) {
279
289
TEST ( function test_resolvePtr_failure ( done ) {
280
290
dnsPromises . resolvePtr ( addresses . INVALID_HOST )
281
291
. then ( common . mustNotCall ( ) )
282
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
292
+ . catch ( common . mustCall ( ( err ) => {
293
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
294
+ } ) ) ;
283
295
284
296
const req = dns . resolvePtr ( addresses . INVALID_HOST , function ( err , result ) {
285
297
assert . ok ( err instanceof Error ) ;
286
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
298
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
287
299
288
300
assert . strictEqual ( result , undefined ) ;
289
301
@@ -322,11 +334,13 @@ TEST(async function test_resolveNaptr(done) {
322
334
TEST ( function test_resolveNaptr_failure ( done ) {
323
335
dnsPromises . resolveNaptr ( addresses . INVALID_HOST )
324
336
. then ( common . mustNotCall ( ) )
325
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
337
+ . catch ( common . mustCall ( ( err ) => {
338
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
339
+ } ) ) ;
326
340
327
341
const req = dns . resolveNaptr ( addresses . INVALID_HOST , function ( err , result ) {
328
342
assert . ok ( err instanceof Error ) ;
329
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
343
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
330
344
331
345
assert . strictEqual ( result , undefined ) ;
332
346
@@ -369,11 +383,13 @@ TEST(async function test_resolveSoa(done) {
369
383
TEST ( function test_resolveSoa_failure ( done ) {
370
384
dnsPromises . resolveSoa ( addresses . INVALID_HOST )
371
385
. then ( common . mustNotCall ( ) )
372
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
386
+ . catch ( common . mustCall ( ( err ) => {
387
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
388
+ } ) ) ;
373
389
374
390
const req = dns . resolveSoa ( addresses . INVALID_HOST , function ( err , result ) {
375
391
assert . ok ( err instanceof Error ) ;
376
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
392
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
377
393
378
394
assert . strictEqual ( result , undefined ) ;
379
395
@@ -407,11 +423,13 @@ TEST(async function test_resolveCname(done) {
407
423
TEST ( function test_resolveCname_failure ( done ) {
408
424
dnsPromises . resolveCname ( addresses . INVALID_HOST )
409
425
. then ( common . mustNotCall ( ) )
410
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
426
+ . catch ( common . mustCall ( ( err ) => {
427
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
428
+ } ) ) ;
411
429
412
430
const req = dns . resolveCname ( addresses . INVALID_HOST , function ( err , result ) {
413
431
assert . ok ( err instanceof Error ) ;
414
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
432
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
415
433
416
434
assert . strictEqual ( result , undefined ) ;
417
435
@@ -443,11 +461,13 @@ TEST(async function test_resolveTxt(done) {
443
461
TEST ( function test_resolveTxt_failure ( done ) {
444
462
dnsPromises . resolveTxt ( addresses . INVALID_HOST )
445
463
. then ( common . mustNotCall ( ) )
446
- . catch ( common . expectsError ( { errno : 'ENOTFOUND' } ) ) ;
464
+ . catch ( common . mustCall ( ( err ) => {
465
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
466
+ } ) ) ;
447
467
448
468
const req = dns . resolveTxt ( addresses . INVALID_HOST , function ( err , result ) {
449
469
assert . ok ( err instanceof Error ) ;
450
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
470
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
451
471
452
472
assert . strictEqual ( result , undefined ) ;
453
473
@@ -461,12 +481,12 @@ TEST(function test_resolveTxt_failure(done) {
461
481
TEST ( function test_lookup_failure ( done ) {
462
482
dnsPromises . lookup ( addresses . INVALID_HOST , 4 )
463
483
. then ( common . mustNotCall ( ) )
464
- . catch ( common . expectsError ( { errno : dns . NOTFOUND } ) ) ;
484
+ . catch ( common . expectsError ( { code : dns . NOTFOUND } ) ) ;
465
485
466
486
const req = dns . lookup ( addresses . INVALID_HOST , 4 , ( err ) => {
467
487
assert . ok ( err instanceof Error ) ;
468
- assert . strictEqual ( err . errno , dns . NOTFOUND ) ;
469
- assert . strictEqual ( err . errno , 'ENOTFOUND' ) ;
488
+ assert . strictEqual ( err . code , dns . NOTFOUND ) ;
489
+ assert . strictEqual ( err . code , 'ENOTFOUND' ) ;
470
490
assert . ok ( ! / E N O E N T / . test ( err . message ) ) ;
471
491
assert . ok ( err . message . includes ( addresses . INVALID_HOST ) ) ;
472
492
0 commit comments