Skip to content

Commit 26204dd

Browse files
author
Sosuke Suzuki
committed
Leave some tests on tap
1 parent 865309c commit 26204dd

File tree

4 files changed

+66
-59
lines changed

4 files changed

+66
-59
lines changed

test/client-connect.js

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
'use strict'
2+
3+
const { test } = require('tap')
4+
const { Client, errors } = require('..')
5+
const http = require('http')
6+
const EE = require('events')
7+
const { kBusy } = require('../lib/core/symbols')
8+
9+
// TODO: move to test/node-test/client-connect.js
10+
test('connect aborted after connect', (t) => {
11+
t.plan(3)
12+
13+
const signal = new EE()
14+
const server = http.createServer((req, res) => {
15+
t.fail()
16+
})
17+
server.on('connect', (req, c, firstBodyChunk) => {
18+
signal.emit('abort')
19+
})
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.type(err, errors.RequestAbortedError)
35+
})
36+
t.equal(client[kBusy], true)
37+
})
38+
})

test/client-errors.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
'use strict'
2+
3+
const { test } = require('tap')
4+
const { Client } = require('..')
5+
const net = require('net')
6+
7+
// TODO: move to test/node-test/client-connect.js
8+
test('parser error', (t) => {
9+
t.plan(2)
10+
11+
const server = net.createServer()
12+
server.once('connection', (socket) => {
13+
socket.write('asd\n\r213123')
14+
})
15+
t.teardown(server.close.bind(server))
16+
17+
server.listen(0, () => {
18+
const client = new Client(`http://localhost:${server.address().port}`)
19+
t.teardown(client.destroy.bind(client))
20+
21+
client.request({ path: '/', method: 'GET' }, (err) => {
22+
t.ok(err)
23+
client.close((err) => {
24+
t.error(err)
25+
})
26+
})
27+
})
28+
})

test/node-test/client-connect.js

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -291,36 +291,3 @@ test('connect invalid signal', async (t) => {
291291

292292
await p.completed
293293
})
294-
295-
test('connect aborted after connect', async (t) => {
296-
const p = tspl(t, { plan: 3 })
297-
298-
const signal = new EE()
299-
const server = http.createServer((req, res) => {
300-
p.ok(0)
301-
})
302-
server.on('connect', (req, c, firstBodyChunk) => {
303-
signal.emit('abort')
304-
})
305-
// FIXME: use closeServerAsPromise
306-
t.after(server.close.bind(server))
307-
308-
server.listen(0, () => {
309-
const client = new Client(`http://localhost:${server.address().port}`, {
310-
pipelining: 3
311-
})
312-
t.after(client.destroy.bind(client))
313-
314-
client.connect({
315-
path: '/',
316-
signal,
317-
opaque: 'asd'
318-
}, (err, { opaque }) => {
319-
p.strictEqual(opaque, 'asd')
320-
p.ok(err instanceof errors.RequestAbortedError)
321-
})
322-
p.strictEqual(client[kBusy], true)
323-
})
324-
325-
await p.completed
326-
})

test/node-test/client-errors.js

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const { Client, Pool, errors } = require('../..')
66
const { createServer } = require('http')
77
const https = require('https')
88
const pem = require('https-pem')
9-
const net = require('net')
109
const { Readable } = require('stream')
1110
const { tspl } = require('@matteo.collina/tspl')
1211

@@ -840,31 +839,6 @@ test('validate request body', async (t) => {
840839
await p.completed
841840
})
842841

843-
test('parser error', async (t) => {
844-
const p = tspl(t, { plan: 2 })
845-
846-
const server = net.createServer()
847-
server.once('connection', (socket) => {
848-
socket.write('asd\n\r213123')
849-
})
850-
// FIXME: use closeServerAsPromise
851-
t.after(server.close.bind(server))
852-
853-
server.listen(0, () => {
854-
const client = new Client(`http://localhost:${server.address().port}`)
855-
t.after(client.destroy.bind(client))
856-
857-
client.request({ path: '/', method: 'GET' }, (err) => {
858-
p.ok(err)
859-
client.close((err) => {
860-
p.ifError(err)
861-
})
862-
})
863-
})
864-
865-
await p.completed
866-
})
867-
868842
function socketFailWrite (type) {
869843
test(`socket fail while writing ${type} request body`, async (t) => {
870844
const p = tspl(t, { plan: 2 })

0 commit comments

Comments
 (0)