From 0012484f4f194664bea87879ab9f4f20f4ee86c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Sun, 27 Nov 2022 04:50:14 +0100
Subject: =?UTF-8?q?Revert=20"fix(ext/flash):=20graceful=20server=20startup?=
 =?UTF-8?q?/shutdown=20with=20unsettl=E2=80=A6=20(#16839)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…ed promises in mind (#16616)"

This reverts commit fd023cf7937e67dfde5482d34ebc60839eb7397c.

There are reports saying that Vite is often hanging in 1.28.2 and this
is
the only PR that changed something with HTTP server. I think we should
hold off on trying to fix this and instead focus on #16787

CC @magurotuna
---
 cli/tests/unit/flash_test.ts | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

(limited to 'cli/tests/unit/flash_test.ts')

diff --git a/cli/tests/unit/flash_test.ts b/cli/tests/unit/flash_test.ts
index 761b9137a..024069455 100644
--- a/cli/tests/unit/flash_test.ts
+++ b/cli/tests/unit/flash_test.ts
@@ -57,42 +57,32 @@ Deno.test(async function httpServerCanResolveHostnames() {
   await server;
 });
 
-// TODO(magurotuna): ignore this case for now because it's flaky on GitHub Actions,
-// although it acts as expected when running locally.
-// See https://github.com/denoland/deno/pull/16616
-Deno.test({ ignore: true }, async function httpServerRejectsOnAddrInUse() {
-  const ac1 = new AbortController();
+Deno.test(async function httpServerRejectsOnAddrInUse() {
+  const ac = new AbortController();
   const listeningPromise = deferred();
-  let port: number;
 
   const server = Deno.serve({
     handler: (_req) => new Response("ok"),
     hostname: "localhost",
-    port: 0,
-    signal: ac1.signal,
-    onListen: (addr) => {
-      port = addr.port;
-      listeningPromise.resolve();
-    },
-    onError: createOnErrorCb(ac1),
+    port: 4501,
+    signal: ac.signal,
+    onListen: onListen(listeningPromise),
+    onError: createOnErrorCb(ac),
   });
 
-  await listeningPromise;
-
-  const ac2 = new AbortController();
   assertRejects(
     () =>
       Deno.serve({
         handler: (_req) => new Response("ok"),
         hostname: "localhost",
-        port,
-        signal: ac2.signal,
+        port: 4501,
+        signal: ac.signal,
+        onListen: onListen(listeningPromise),
+        onError: createOnErrorCb(ac),
       }),
     Deno.errors.AddrInUse,
   );
-
-  ac1.abort();
-  ac2.abort();
+  ac.abort();
   await server;
 });
 
-- 
cgit v1.2.3