From c35c295b2db44e64a23c5c209779f026b02700e5 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Sun, 27 Dec 2020 13:46:50 +0800
Subject: [PATCH] fix tests for actix-rt break change

---
 Cargo.toml                 |  2 ++
 actix-http-test/src/lib.rs | 15 ++++++++------
 src/test.rs                | 11 ++++++----
 tests/test_httpserver.rs   | 41 ++++++++++++++++++++------------------
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6ed327f56..1ff7e2609 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -133,6 +133,8 @@ actix-multipart = { path = "actix-multipart" }
 actix-files = { path = "actix-files" }
 awc = { path = "awc" }
 
+actix-rt = { git = "https://github.com/actix/actix-net.git" }
+
 [[bench]]
 name = "server"
 harness = false
diff --git a/actix-http-test/src/lib.rs b/actix-http-test/src/lib.rs
index 3ab3f8a0d..865d73ba0 100644
--- a/actix-http-test/src/lib.rs
+++ b/actix-http-test/src/lib.rs
@@ -62,14 +62,17 @@ pub async fn test_server_with_addr<F: ServiceFactory<TcpStream>>(
 
     // run server in separate thread
     thread::spawn(move || {
-        let sys = System::new("actix-test-server");
+        let mut sys = System::new("actix-test-server");
         let local_addr = tcp.local_addr().unwrap();
 
-        Server::build()
-            .listen("test", tcp, factory)?
-            .workers(1)
-            .disable_signals()
-            .start();
+        sys.block_on(async {
+            Server::build()
+                .listen("test", tcp, factory)
+                .unwrap()
+                .workers(1)
+                .disable_signals()
+                .start()
+        });
 
         tx.send((System::current(), local_addr)).unwrap();
         sys.run()
diff --git a/src/test.rs b/src/test.rs
index cff6c3e51..804ddbf6f 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -698,7 +698,7 @@ where
 
     // run server in separate thread
     thread::spawn(move || {
-        let sys = System::new("actix-test-server");
+        let mut sys = System::new("actix-test-server");
         let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
         let local_addr = tcp.local_addr().unwrap();
         let factory = factory.clone();
@@ -788,10 +788,13 @@ where
                 }),
             },
         }
-        .unwrap()
-        .start();
+        .unwrap();
+
+        sys.block_on(async {
+            let srv = srv.run();
+            tx.send((System::current(), srv, local_addr)).unwrap();
+        });
 
-        tx.send((System::current(), srv, local_addr)).unwrap();
         sys.run()
     });
 
diff --git a/tests/test_httpserver.rs b/tests/test_httpserver.rs
index 118640aca..c5e1b56f8 100644
--- a/tests/test_httpserver.rs
+++ b/tests/test_httpserver.rs
@@ -13,26 +13,29 @@ async fn test_start() {
     let (tx, rx) = mpsc::channel();
 
     thread::spawn(move || {
-        let sys = actix_rt::System::new("test");
+        let mut sys = actix_rt::System::new("test");
 
-        let srv = HttpServer::new(|| {
-            App::new().service(
-                web::resource("/").route(web::to(|| HttpResponse::Ok().body("test"))),
-            )
-        })
-        .workers(1)
-        .backlog(1)
-        .max_connections(10)
-        .max_connection_rate(10)
-        .keep_alive(10)
-        .client_timeout(5000)
-        .client_shutdown(0)
-        .server_hostname("localhost")
-        .system_exit()
-        .disable_signals()
-        .bind(format!("{}", addr))
-        .unwrap()
-        .run();
+        let srv = sys.block_on(async {
+            HttpServer::new(|| {
+                App::new().service(
+                    web::resource("/")
+                        .route(web::to(|| HttpResponse::Ok().body("test"))),
+                )
+            })
+            .workers(1)
+            .backlog(1)
+            .max_connections(10)
+            .max_connection_rate(10)
+            .keep_alive(10)
+            .client_timeout(5000)
+            .client_shutdown(0)
+            .server_hostname("localhost")
+            .system_exit()
+            .disable_signals()
+            .bind(format!("{}", addr))
+            .unwrap()
+            .run()
+        });
 
         let _ = tx.send((srv, actix_rt::System::current()));
         let _ = sys.run();