chore: share HTTP server between tests (#3966)

cli/test_util.rs

@@ -8,11 +8,13 @@ use std::path::PathBuf;
 use std::process::Child;
 use std::process::Command;
 use std::process::Stdio;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
 use std::sync::Mutex;
-use std::sync::MutexGuard;
 
 lazy_static! {
-  static ref GUARD: Mutex<()> = Mutex::new(());
+  static ref SERVER: Mutex<Option<Child>> = Mutex::new(None);
+  static ref SERVER_COUNT: AtomicUsize = AtomicUsize::new(0);
 }
 
 pub fn root_path() -> PathBuf {
@@ -35,32 +37,40 @@ pub fn deno_exe_path() -> PathBuf {
   p
 }
 
-pub struct HttpServerGuard<'a> {
+pub struct HttpServerGuard {}
-  #[allow(dead_code)]
-  g: MutexGuard<'a, ()>,
-  child: Child,
-}
 
-impl<'a> Drop for HttpServerGuard<'a> {
+impl Drop for HttpServerGuard {
   fn drop(&mut self) {
-    match self.child.try_wait() {
+    let count = SERVER_COUNT.fetch_sub(1, Ordering::SeqCst);
+    // If no more tests hold guard we can kill the server
+
+    if count == 1 {
+      kill_http_server();
+    }
+  }
+}
+
+fn kill_http_server() {
+  let mut server_guard = SERVER.lock().unwrap();
+  let mut child = server_guard
+    .take()
+    .expect("Trying to kill server but already killed");
+  match child.try_wait() {
     Ok(None) => {
-        self.child.kill().expect("failed to kill http_server.py");
+      child.kill().expect("failed to kill http_server.py");
-      }
-      Ok(Some(status)) => {
-        panic!("http_server.py exited unexpectedly {}", status)
-      }
-      Err(e) => panic!("http_server.py err {}", e),
     }
+    Ok(Some(status)) => panic!("http_server.py exited unexpectedly {}", status),
+    Err(e) => panic!("http_server.py error: {}", e),
   }
+  drop(server_guard);
 }
 
-/// Starts tools/http_server.py when the returned guard is dropped, the server
+pub fn http_server() -> HttpServerGuard {
-/// will be killed.
+  SERVER_COUNT.fetch_add(1, Ordering::SeqCst);
-pub fn http_server<'a>() -> HttpServerGuard<'a> {
-  // TODO(ry) Allow tests to use the http server in parallel.
-  let g = GUARD.lock().unwrap();
 
+  {
+    let mut server_guard = SERVER.lock().unwrap();
+    if server_guard.is_none() {
       println!("tools/http_server.py starting...");
       let mut child = Command::new("python")
         .current_dir(root_path())
@@ -74,6 +84,9 @@ pub fn http_server<'a>() -> HttpServerGuard<'a> {
       let mut lines = BufReader::new(stdout).lines();
       let line = lines.next().unwrap().unwrap();
       assert!(line.starts_with("ready"));
-
+      server_guard.replace(child);
-  HttpServerGuard { child, g }
+    }
+  }
+
+  HttpServerGuard {}
 }