Skip to content

Commit 0ddd13c

Browse files
Uzlopakcrysmags
authored andcommitted
chore: migrate a batch of tests to node test runner (nodejs#2737)
1 parent c97db52 commit 0ddd13c

10 files changed

Lines changed: 547 additions & 467 deletions

test/client-connect.js

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
'use strict'
22

3-
const { test } = require('tap')
3+
const { tspl } = require('@matteo.collina/tspl')
4+
const { test, after } = require('node:test')
5+
const { once } = require('node:events')
46
const { Client, errors } = require('..')
57
const http = require('node:http')
68
const EE = require('node:events')
79
const { kBusy } = require('../lib/core/symbols')
810

911
// TODO: move to test/node-test/client-connect.js
10-
test('connect aborted after connect', (t) => {
11-
t.plan(3)
12+
test('connect aborted after connect', async (t) => {
13+
t = tspl(t, { plan: 3 })
1214

1315
const signal = new EE()
1416
const server = http.createServer((req, res) => {
@@ -17,22 +19,26 @@ test('connect aborted after connect', (t) => {
1719
server.on('connect', (req, c, firstBodyChunk) => {
1820
signal.emit('abort')
1921
})
20-
t.teardown(server.close.bind(server))
21-
22-
server.listen(0, () => {
23-
const client = new Client(`http://localhost:${server.address().port}`, {
24-
pipelining: 3
25-
})
26-
t.teardown(client.destroy.bind(client))
27-
28-
client.connect({
29-
path: '/',
30-
signal,
31-
opaque: 'asd'
32-
}, (err, { opaque }) => {
33-
t.equal(opaque, 'asd')
34-
t.ok(err instanceof errors.RequestAbortedError)
35-
})
36-
t.equal(client[kBusy], true)
22+
after(() => server.close())
23+
24+
server.listen(0)
25+
26+
await once(server, 'listening')
27+
28+
const client = new Client(`http://localhost:${server.address().port}`, {
29+
pipelining: 3
3730
})
31+
after(() => client.close())
32+
33+
client.connect({
34+
path: '/',
35+
signal,
36+
opaque: 'asd'
37+
}, (err, { opaque }) => {
38+
t.strictEqual(opaque, 'asd')
39+
t.ok(err instanceof errors.RequestAbortedError)
40+
})
41+
t.strictEqual(client[kBusy], true)
42+
43+
await t.completed
3844
})

test/client-idempotent-body.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
'use strict'
22

3-
const { test } = require('tap')
3+
const { tspl } = require('@matteo.collina/tspl')
4+
const { test, after } = require('node:test')
45
const { Client } = require('..')
56
const { createServer } = require('node:http')
67

7-
test('idempotent retry', (t) => {
8-
t.plan(11)
8+
test('idempotent retry', async (t) => {
9+
t = tspl(t, { plan: 11 })
910

1011
const body = 'world'
1112
const server = createServer((req, res) => {
1213
let buf = ''
1314
req.on('data', data => {
1415
buf += data
1516
}).on('end', () => {
16-
t.strictSame(buf, body)
17+
t.strictEqual(buf, body)
1718
res.end()
1819
})
1920
})
20-
t.teardown(server.close.bind(server))
21+
after(() => server.close())
2122

2223
server.listen(0, () => {
2324
const client = new Client(`http://localhost:${server.address().port}`, {
2425
pipelining: 2
2526
})
26-
t.teardown(client.close.bind(client))
27+
after(() => client.close())
2728

2829
const _err = new Error()
2930

@@ -36,8 +37,10 @@ test('idempotent retry', (t) => {
3637
}, () => {
3738
throw _err
3839
}, (err) => {
39-
t.equal(err, _err)
40+
t.strictEqual(err, _err)
4041
})
4142
}
4243
})
44+
45+
await t.completed
4346
})

0 commit comments

Comments
 (0)