From acaff5e22517f981e4ca3627ccc4257d9874c568 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Tue, 30 Mar 2021 21:11:53 +0800
Subject: [PATCH] fix tests

---
 actix-server/tests/test_server.rs | 45 ++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs
index 2da331ad..a0a5b27b 100644
--- a/actix-server/tests/test_server.rs
+++ b/actix-server/tests/test_server.rs
@@ -22,20 +22,21 @@ fn test_bind() {
     let (tx, rx) = mpsc::channel();
 
     let h = thread::spawn(move || {
-        let sys = actix_rt::System::new();
-        sys.block_on(async {
-            actix_rt::spawn(async move {
-                let _ = Server::build()
-                    .workers(1)
-                    .disable_signals()
-                    .bind("test", addr, move || fn_service(|_| ok::<_, ()>(())))
-                    .unwrap()
-                    .run()
-                    .await;
+        let system = actix_rt::System::new();
+        system.block_on(async {
+            let server = Server::build()
+                .workers(1)
+                .disable_signals()
+                .bind("test", addr, move || fn_service(|_| ok::<_, ()>(())))
+                .unwrap()
+                .run();
+            let _ = tx.send(actix_rt::System::current());
+            let _ = actix_rt::spawn(async move {
+                let _ = server.await;
             });
         });
-        let _ = tx.send(actix_rt::System::current());
-        let _ = sys.run();
+
+        system.run()
     });
     let sys = rx.recv().unwrap();
 
@@ -54,18 +55,20 @@ fn test_listen() {
         let sys = actix_rt::System::new();
         let lst = net::TcpListener::bind(addr).unwrap();
         sys.block_on(async {
+            let server = Server::build()
+                .disable_signals()
+                .workers(1)
+                .listen("test", lst, move || fn_service(|_| ok::<_, ()>(())))
+                .unwrap()
+                .run();
+
+            let _ = tx.send(actix_rt::System::current());
+
             actix_rt::spawn(async move {
-                let _ = Server::build()
-                    .disable_signals()
-                    .workers(1)
-                    .listen("test", lst, move || fn_service(|_| ok::<_, ()>(())))
-                    .unwrap()
-                    .run()
-                    .await;
+                let _ = server.await;
             });
         });
-        let _ = tx.send(actix_rt::System::current());
-        let _ = sys.run();
+        sys.run()
     });
     let sys = rx.recv().unwrap();