1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-31 11:34:15 -05:00

ignore PoisonError in test_server (#6567)

This commit is contained in:
Ryan Dahl 2020-06-29 17:04:19 -04:00 committed by GitHub
parent f5242f333e
commit a19d6a2613
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -78,7 +78,13 @@ impl<'a> Drop for HttpServerGuard<'a> {
/// will be killed.
pub fn http_server<'a>() -> HttpServerGuard<'a> {
// TODO(bartlomieju) Allow tests to use the http server in parallel.
let g = GUARD.lock().unwrap();
let r = GUARD.lock();
let g = if let Err(poison_err) = r {
// If panics happened, ignore it. This is for tests.
poison_err.into_inner()
} else {
r.unwrap()
};
println!("tools/http_server.py starting...");
let mut child = Command::new("python")