1
0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-26 06:57:43 +02:00

update actix api

This commit is contained in:
Nikolay Kim
2018-06-13 23:37:19 -07:00
parent c8528e8920
commit 8261cf437d
10 changed files with 100 additions and 95 deletions

View File

@ -32,7 +32,7 @@ use tokio::executor::current_thread;
use tokio::runtime::current_thread::Runtime;
use tokio_tcp::TcpStream;
use actix::{msgs, Arbiter, System};
use actix::System;
use actix_web::*;
const STR: &str = "Hello World Hello World Hello World Hello World Hello World \
@ -74,10 +74,11 @@ fn test_start() {
let srv = srv.bind("127.0.0.1:0").unwrap();
let addr = srv.addrs()[0];
let srv_addr = srv.start();
let _ = tx.send((addr, srv_addr, Arbiter::system()));
let _ = tx.send((addr, srv_addr, System::current()));
});
});
let (addr, srv_addr, sys) = rx.recv().unwrap();
System::set_current(sys.clone());
let mut rt = Runtime::new().unwrap();
{
@ -110,7 +111,7 @@ fn test_start() {
assert!(response.status().is_success());
}
let _ = sys.send(msgs::SystemExit(0)).wait();
let _ = sys.stop();
}
#[test]
@ -130,10 +131,11 @@ fn test_shutdown() {
let srv = srv.bind("127.0.0.1:0").unwrap();
let addr = srv.addrs()[0];
let srv_addr = srv.shutdown_timeout(1).start();
let _ = tx.send((addr, srv_addr, Arbiter::system()));
let _ = tx.send((addr, srv_addr, System::current()));
});
});
let (addr, srv_addr, sys) = rx.recv().unwrap();
System::set_current(sys.clone());
let mut rt = Runtime::new().unwrap();
{
@ -148,7 +150,7 @@ fn test_shutdown() {
thread::sleep(time::Duration::from_millis(1000));
assert!(net::TcpStream::connect(addr).is_err());
let _ = sys.send(msgs::SystemExit(0)).wait();
let _ = sys.stop();
}
#[test]