test(setup): fix server closure (vitejs#3056)

TobiasMelen · May 3, 2021 · 65d8e4b · 65d8e4b
1 parent f0a1300
commit 65d8e4b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/playground/ssr-react/__tests__/serve.js b/packages/playground/ssr-react/__tests__/serve.js
@@ -45,9 +45,13 @@ exports.serve = async function serve(root, isProd) {
       const server = app.listen(port, () => {
         resolve({
           // for test teardown
-          close() {
-            server.close()
-            return vite && vite.close()
+          async close() {
+            await new Promise((resolve) => {
+              server.close(resolve)
+            })
+            if (vite) {
+              await vite.close()
+            }
           }
         })
       })

diff --git a/packages/playground/ssr-vue/__tests__/serve.js b/packages/playground/ssr-vue/__tests__/serve.js
@@ -45,9 +45,13 @@ exports.serve = async function serve(root, isProd) {
       const server = app.listen(port, () => {
         resolve({
           // for test teardown
-          close() {
-            server.close()
-            return vite && vite.close()
+          async close() {
+            await new Promise((resolve) => {
+              server.close(resolve)
+            })
+            if (vite) {
+              await vite.close()
+            }
           }
         })
       })