Add closeClientAndServerAsPromise to http2

Author: sosukesuzuki

test/fetch/http2.js

@@ -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])
 
@@ -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)
 })
@@ -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')
@@ -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)
@@ -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}/`,
@@ -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}/`,
@@ -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}/`,
@@ -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))
 })
@@ -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}/`,

test/utils/node-http.js

@@ -4,6 +4,16 @@ function closeServerAsPromise (server) {
   return () => util.promisify(server.close.bind(server))()
 }
 
+function closeClientAndServerAsPromise (client, server) {
+  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
 }