1
1
'use strict'
2
2
3
- const { test, skip } = require ( 'tap ' )
3
+ const { test, skip } = require ( 'node:test ' )
4
4
const dgram = require ( 'dgram' )
5
5
const { Resolver } = require ( 'dns' )
6
6
const dnsPacket = require ( 'dns-packet' )
7
7
const { createServer } = require ( 'http' )
8
- const { Client, Agent, request } = require ( '..' )
9
- const { nodeHasAutoSelectFamily } = require ( '../lib/core/util' )
8
+ const { Client, Agent, request } = require ( '../..' )
9
+ const { nodeHasAutoSelectFamily } = require ( '../../lib/core/util' )
10
+ const { tspl } = require ( '@matteo.collina/tspl' )
10
11
11
12
/*
12
13
* IMPORTANT
@@ -67,15 +68,15 @@ function createDnsServer (ipv6Addr, ipv4Addr, cb) {
67
68
} )
68
69
}
69
70
70
- test ( 'with autoSelectFamily enable the request succeeds when using request' , ( t ) => {
71
- t . plan ( 3 )
71
+ test ( 'with autoSelectFamily enable the request succeeds when using request' , async ( t ) => {
72
+ const p = tspl ( t , { plan : 3 } )
72
73
73
74
createDnsServer ( '::1' , '127.0.0.1' , function ( _ , { dnsServer, lookup } ) {
74
75
const server = createServer ( ( req , res ) => {
75
76
res . end ( 'hello' )
76
77
} )
77
78
78
- t . teardown ( ( ) => {
79
+ t . after ( ( ) => {
79
80
server . close ( )
80
81
dnsServer . close ( )
81
82
} )
@@ -88,7 +89,7 @@ test('with autoSelectFamily enable the request succeeds when using request', (t)
88
89
method : 'GET' ,
89
90
dispatcher : agent
90
91
} , ( err , { statusCode, body } ) => {
91
- t . error ( err )
92
+ p . ifError ( err )
92
93
93
94
let response = Buffer . alloc ( 0 )
94
95
@@ -97,37 +98,39 @@ test('with autoSelectFamily enable the request succeeds when using request', (t)
97
98
} )
98
99
99
100
body . on ( 'end' , ( ) => {
100
- t . strictSame ( statusCode , 200 )
101
- t . strictSame ( response . toString ( 'utf-8' ) , 'hello' )
101
+ p . strictEqual ( statusCode , 200 )
102
+ p . strictEqual ( response . toString ( 'utf-8' ) , 'hello' )
102
103
} )
103
104
} )
104
105
} )
105
106
} )
107
+
108
+ await p . completed
106
109
} )
107
110
108
- test ( 'with autoSelectFamily enable the request succeeds when using a client' , ( t ) => {
109
- t . plan ( 3 )
111
+ test ( 'with autoSelectFamily enable the request succeeds when using a client' , async ( t ) => {
112
+ const p = tspl ( t , { plan : 3 } )
110
113
111
114
createDnsServer ( '::1' , '127.0.0.1' , function ( _ , { dnsServer, lookup } ) {
112
115
const server = createServer ( ( req , res ) => {
113
116
res . end ( 'hello' )
114
117
} )
115
118
116
- t . teardown ( ( ) => {
119
+ t . after ( ( ) => {
117
120
server . close ( )
118
121
dnsServer . close ( )
119
122
} )
120
123
121
124
server . listen ( 0 , '127.0.0.1' , ( ) => {
122
125
const client = new Client ( `http://example.org:${ server . address ( ) . port } ` , { connect : { lookup } , autoSelectFamily : true } )
123
126
124
- t . teardown ( client . destroy . bind ( client ) )
127
+ t . after ( client . destroy . bind ( client ) )
125
128
126
129
client . request ( {
127
130
path : '/' ,
128
131
method : 'GET'
129
132
} , ( err , { statusCode, body } ) => {
130
- t . error ( err )
133
+ p . ifError ( err )
131
134
132
135
let response = Buffer . alloc ( 0 )
133
136
@@ -136,23 +139,25 @@ test('with autoSelectFamily enable the request succeeds when using a client', (t
136
139
} )
137
140
138
141
body . on ( 'end' , ( ) => {
139
- t . strictSame ( statusCode , 200 )
140
- t . strictSame ( response . toString ( 'utf-8' ) , 'hello' )
142
+ p . strictEqual ( statusCode , 200 )
143
+ p . strictEqual ( response . toString ( 'utf-8' ) , 'hello' )
141
144
} )
142
145
} )
143
146
} )
144
147
} )
148
+
149
+ await p . completed
145
150
} )
146
151
147
- test ( 'with autoSelectFamily disabled the request fails when using request' , ( t ) => {
148
- t . plan ( 1 )
152
+ test ( 'with autoSelectFamily disabled the request fails when using request' , async ( t ) => {
153
+ const p = tspl ( t , { plan : 1 } )
149
154
150
155
createDnsServer ( '::1' , '127.0.0.1' , function ( _ , { dnsServer, lookup } ) {
151
156
const server = createServer ( ( req , res ) => {
152
157
res . end ( 'hello' )
153
158
} )
154
159
155
- t . teardown ( ( ) => {
160
+ t . after ( ( ) => {
156
161
server . close ( )
157
162
dnsServer . close ( )
158
163
} )
@@ -164,35 +169,39 @@ test('with autoSelectFamily disabled the request fails when using request', (t)
164
169
method : 'GET' ,
165
170
dispatcher : agent
166
171
} , ( err , { statusCode, body } ) => {
167
- t . ok ( [ 'ECONNREFUSED' , 'EAFNOSUPPORT' ] . includes ( err . code ) )
172
+ p . ok ( [ 'ECONNREFUSED' , 'EAFNOSUPPORT' ] . includes ( err . code ) )
168
173
} )
169
174
} )
170
175
} )
176
+
177
+ await p . completed
171
178
} )
172
179
173
- test ( 'with autoSelectFamily disabled the request fails when using a client' , ( t ) => {
174
- t . plan ( 1 )
180
+ test ( 'with autoSelectFamily disabled the request fails when using a client' , async ( t ) => {
181
+ const p = tspl ( t , { plan : 1 } )
175
182
176
183
createDnsServer ( '::1' , '127.0.0.1' , function ( _ , { dnsServer, lookup } ) {
177
184
const server = createServer ( ( req , res ) => {
178
185
res . end ( 'hello' )
179
186
} )
180
187
181
- t . teardown ( ( ) => {
188
+ t . after ( ( ) => {
182
189
server . close ( )
183
190
dnsServer . close ( )
184
191
} )
185
192
186
193
server . listen ( 0 , '127.0.0.1' , ( ) => {
187
194
const client = new Client ( `http://example.org:${ server . address ( ) . port } ` , { connect : { lookup, autoSelectFamily : false } } )
188
- t . teardown ( client . destroy . bind ( client ) )
195
+ t . after ( client . destroy . bind ( client ) )
189
196
190
197
client . request ( {
191
198
path : '/' ,
192
199
method : 'GET'
193
200
} , ( err , { statusCode, body } ) => {
194
- t . ok ( [ 'ECONNREFUSED' , 'EAFNOSUPPORT' ] . includes ( err . code ) )
201
+ p . ok ( [ 'ECONNREFUSED' , 'EAFNOSUPPORT' ] . includes ( err . code ) )
195
202
} )
196
203
} )
197
204
} )
205
+
206
+ await p . completed
198
207
} )
0 commit comments