2 files changed, 66 insertions, 0 deletions
diff --git a/cli/tests/integration/watcher_tests.rs b/cli/tests/integration/watcher_tests.rs
index 58f7e11fa..6e3319b11 100644
--- a/cli/tests/integration/watcher_tests.rs
+++ b/cli/tests/integration/watcher_tests.rs
@@ -1167,3 +1167,68 @@ fn run_watch_dynamic_imports() {
 
   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);
+}
diff --git a/cli/tests/unit/flash_test.ts b/cli/tests/unit/flash_test.ts
index 024069455..c64a7fe5a 100644
--- a/cli/tests/unit/flash_test.ts
+++ b/cli/tests/unit/flash_test.ts
@@ -70,6 +70,7 @@ Deno.test(async function httpServerRejectsOnAddrInUse() {
     onError: createOnErrorCb(ac),
   });
 
+  await listeningPromise;
   assertRejects(
     () =>
       Deno.serve({