From 340feeeff93e8bb251399b375a238d378d16656a Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Sun, 27 Dec 2020 14:16:25 +0800
Subject: [PATCH] fix benchmark

---
 benches/server.rs        | 12 ++++++++----
 tests/test_httpserver.rs | 11 +++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/benches/server.rs b/benches/server.rs
index 041d0fa57..ddd5b14c7 100644
--- a/benches/server.rs
+++ b/benches/server.rs
@@ -31,16 +31,20 @@ fn bench_async_burst(c: &mut Criterion) {
     // Maybe add to actix_rt docs
     let mut rt = actix_rt::System::new("test");
 
-    let srv = test::start(|| {
-        App::new()
-            .service(web::resource("/").route(web::to(|| HttpResponse::Ok().body(STR))))
+    let srv = rt.block_on(async {
+        test::start(|| {
+            App::new().service(
+                web::resource("/").route(web::to(|| HttpResponse::Ok().body(STR))),
+            )
+        })
     });
 
     let url = srv.url("/");
 
     c.bench_function("get_body_async_burst", move |b| {
         b.iter_custom(|iters| {
-            let client = Client::new().get(url.clone()).freeze().unwrap();
+            let client =
+                rt.block_on(async { Client::new().get(url.clone()).freeze().unwrap() });
 
             let start = std::time::Instant::now();
             // benchmark body
diff --git a/tests/test_httpserver.rs b/tests/test_httpserver.rs
index c5e1b56f8..b1d3390d5 100644
--- a/tests/test_httpserver.rs
+++ b/tests/test_httpserver.rs
@@ -89,7 +89,7 @@ async fn test_start_ssl() {
     let (tx, rx) = mpsc::channel();
 
     thread::spawn(move || {
-        let sys = actix_rt::System::new("test");
+        let mut sys = actix_rt::System::new("test");
         let builder = ssl_acceptor().unwrap();
 
         let srv = HttpServer::new(|| {
@@ -103,10 +103,13 @@ async fn test_start_ssl() {
         .system_exit()
         .disable_signals()
         .bind_openssl(format!("{}", addr), builder)
-        .unwrap()
-        .run();
+        .unwrap();
+
+        sys.block_on(async {
+            let srv = srv.run();
+            let _ = tx.send((srv, actix_rt::System::current()));
+        });
 
-        let _ = tx.send((srv, actix_rt::System::current()));
         let _ = sys.run();
     });
     let (srv, sys) = rx.recv().unwrap();