2 files changed, 11 insertions, 86 deletions
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;
 });
 
diff --git a/cli/tests/watcher_tests.rs b/cli/tests/watcher_tests.rs
index 0ef9d72b5..f9c8e1508 100644
--- a/cli/tests/watcher_tests.rs
+++ b/cli/tests/watcher_tests.rs
@@ -1179,69 +1179,4 @@ mod watcher {
 
     check_alive_then_kill(child);
   }
-
-  // https://github.com/denoland/deno/issues/16267
-  #[test]
-  fn run_watch_flash() {
-    let filename = "watch_flash.js";
-    let t = TempDir::new();
-    let file_to_watch = t.path().join(filename);
-    write(
-      &file_to_watch,
-      r#"
-      console.log("Starting flash server...");
-      Deno.serve({
-        onListen() {
-            console.error("First server is listening");
-        },
-        handler: () => {},
-        port: 4601,
-      });
-    "#,
-    )
-    .unwrap();
-
-    let mut child = util::deno_cmd()
-      .current_dir(t.path())
-      .arg("run")
-      .arg("--watch")
-      .arg("--unstable")
-      .arg("--allow-net")
-      .arg("-L")
-      .arg("debug")
-      .arg(&file_to_watch)
-      .env("NO_COLOR", "1")
-      .stdout(std::process::Stdio::piped())
-      .stderr(std::process::Stdio::piped())
-      .spawn()
-      .unwrap();
-    let (mut stdout_lines, mut stderr_lines) = child_lines(&mut child);
-
-    wait_contains("Starting flash server...", &mut stdout_lines);
-    wait_for(
-      |m| m.contains("Watching paths") && m.contains(filename),
-      &mut stderr_lines,
-    );
-
-    write(
-      &file_to_watch,
-      r#"
-      console.log("Restarting flash server...");
-      Deno.serve({
-        onListen() {
-            console.error("Second server is listening");
-        },
-        handler: () => {},
-        port: 4601,
-      });
-    "#,
-    )
-    .unwrap();
-
-    wait_contains("File change detected! Restarting!", &mut stderr_lines);
-    wait_contains("Restarting flash server...", &mut stdout_lines);
-    wait_contains("Second server is listening", &mut stderr_lines);
-
-    check_alive_then_kill(child);
-  }
 }