fix tests for actix-rt break change

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

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();
 
+        sys.block_on(async {
             Server::build()
-            .listen("test", tcp, factory)?
+                .listen("test", tcp, factory)
+                .unwrap()
                 .workers(1)
                 .disable_signals()
-            .start();
+                .start()
+        });
 
         tx.send((System::current(), local_addr)).unwrap();
         sys.run()

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()
+        .unwrap();
-        .start();
 
+        sys.block_on(async {
+            let srv = srv.run();
             tx.send((System::current(), srv, local_addr)).unwrap();
+        });
+
         sys.run()
     });
 

tests/test_httpserver.rs

@@ -13,11 +13,13 @@ 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(|| {
+        let srv = sys.block_on(async {
+            HttpServer::new(|| {
                 App::new().service(
-                web::resource("/").route(web::to(|| HttpResponse::Ok().body("test"))),
+                    web::resource("/")
+                        .route(web::to(|| HttpResponse::Ok().body("test"))),
                 )
             })
             .workers(1)
@@ -32,7 +34,8 @@ async fn test_start() {
             .disable_signals()
             .bind(format!("{}", addr))
             .unwrap()
-        .run();
+            .run()
+        });
 
         let _ = tx.send((srv, actix_rt::System::current()));
         let _ = sys.run();