From a19d6a2613b65771748cee97c620c04a62e8a6e4 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Mon, 29 Jun 2020 17:04:19 -0400
Subject: ignore PoisonError in test_server (#6567)

---
 test_util/src/lib.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'test_util/src')

diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
index 86b43ec36..f63ed71a7 100644
--- a/test_util/src/lib.rs
+++ b/test_util/src/lib.rs
@@ -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")
-- 
cgit v1.2.3