Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add test helper for closing server as promise #2604

Merged
merged 4 commits into from
Jan 8, 2024
Merged

fix: add test helper for closing server as promise #2604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e11a35d
Introduce `closeServerAsPromise` helper
sosukesuzuki Jan 8, 2024
93c2e40
Remove needless call
sosukesuzuki Jan 8, 2024
16d1acb
Add `closeClientAndServerAsPromise` to http2
sosukesuzuki Jan 8, 2024
d7c0363
Move `debug.js` to `node-test`
sosukesuzuki Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add closeClientAndServerAsPromise to http2
  • Loading branch information
@sosukesuzuki
sosukesuzuki committed Jan 8, 2024
commit 16d1acbe94ea9660bb9850de29529ed97dd2441e
26 changes: 9 additions & 17 deletions test/fetch/http2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const pem = require('https-pem')

const { Client, fetch, Headers } = require('../..')

const { closeServerAsPromise } = require('../utils/node-http')
const { closeClientAndServerAsPromise } = require('../utils/node-http')

const nodeVersion = Number(process.version.split('v')[1].split('.')[0])

Expand Down Expand Up @@ -64,8 +64,7 @@ test('[Fetch] Issue#2311', async (t) => {

const responseBody = await response.text()

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

strictEqual(responseBody, expectedBody)
})
Expand Down Expand Up @@ -112,8 +111,7 @@ test('[Fetch] Simple GET with h2', async (t) => {

const responseBody = await response.text()

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

strictEqual(responseBody, expectedRequestBody)
strictEqual(response.headers.get('x-method'), 'GET')
Expand Down Expand Up @@ -173,8 +171,7 @@ test('[Fetch] Should handle h2 request with body (string or buffer)', async (t)

const responseBody = await response.text()

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

strictEqual(Buffer.concat(requestBody).toString('utf-8'), expectedBody)
strictEqual(responseBody, expectedRequestBody)
Expand Down Expand Up @@ -220,8 +217,7 @@ test(
allowH2: true
})

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

const response = await fetch(
`https://localhost:${server.address().port}/`,
Expand Down Expand Up @@ -283,8 +279,7 @@ test('Should handle h2 request with body (Blob)', { skip: !Blob }, async (t) =>
allowH2: true
})

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

const response = await fetch(
`https://localhost:${server.address().port}/`,
Expand Down Expand Up @@ -350,8 +345,7 @@ test(
allowH2: true
})

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

const response = await fetch(
`https://localhost:${server.address().port}/`,
Expand Down Expand Up @@ -409,8 +403,7 @@ test('Issue#2415', async (t) => {

await response.text()

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

doesNotThrow(() => new Headers(response.headers))
})
Expand Down Expand Up @@ -451,8 +444,7 @@ test('Issue #2386', async (t) => {
allowH2: true
})

t.after(closeServerAsPromise(server))
t.after(() => client.close())
t.after(closeClientAndServerAsPromise(client, server))

await fetch(
`https://localhost:${server.address().port}/`,
Expand Down
12 changes: 11 additions & 1 deletion test/utils/node-http.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ function closeServerAsPromise (server) {
return () => util.promisify(server.close.bind(server))()
}

function closeClientAndServerAsPromise (client, server) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When testing http2 server/client, all sessions must be closed before closing the server. ref: https://nodejs.org/api/http2.html#serverclosecallback_1

const closeClient = util.promisify(client.close.bind(client))
const closeServer = util.promisify(server.close.bind(server))
return async () => {
await closeClient()
await closeServer()
}
}

module.exports = {
closeServerAsPromise
closeServerAsPromise,
closeClientAndServerAsPromise
}
Loading