From 65d8e4b8c6b2ce5df87dcc86a1c27a4536d841e5 Mon Sep 17 00:00:00 2001
From: Nihal Gonsalves <nihal@nihalgonsalves.com>
Date: Mon, 19 Apr 2021 23:03:11 +0200
Subject: [PATCH] test(setup): fix server closure (#3056)

---
 packages/playground/ssr-react/__tests__/serve.js | 10 +++++++---
 packages/playground/ssr-vue/__tests__/serve.js   | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/playground/ssr-react/__tests__/serve.js b/packages/playground/ssr-react/__tests__/serve.js
index 750a8554167719..7c7b1867ae53f6 100644
--- 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
index 3b929218b7eda8..c0bca625106e4e 100644
--- 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()
+            }
           }
         })
       })