forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(server): use current_thread instead of rt::run with http2 tests

Browse Source
This commit is contained in:
Sean McArthur
2018-06-25 11:35:57 -07:00
parent ffdb478831
commit 6848ba63fb
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/server.rs
View File

@@ -48,8 +48,10 @@ fn try_h2() {
let mut rt = Runtime::new().expect("runtime new"); let mut rt = Runtime::new().expect("runtime new");
rt.block_on(hyper::rt::lazy(move || { rt.block_on(hyper::rt::lazy(move || {
let client: Client<_, hyper::Body> = Client::builder().http2_only(true).build_http(); let client = Client::builder()
let uri = addr_str.parse::<hyper::Uri>().expect("server addr should parse"); .http2_only(true)
.build_http::<hyper::Body>();
let uri = addr_str.parse().expect("server addr should parse");
client.get(uri) client.get(uri)
.and_then(|_res| { Ok(()) }) .and_then(|_res| { Ok(()) })
@@ -364,8 +366,11 @@ mod response_body_lengths {
let addr_str = format!("http://{}", server.addr()); let addr_str = format!("http://{}", server.addr());
server.reply().body("Hello, World!"); server.reply().body("Hello, World!");
hyper::rt::run(hyper::rt::lazy(move || { let mut rt = Runtime::new().expect("rt new");
let client: Client<_, hyper::Body> = Client::builder().http2_only(true).build_http(); rt.block_on(hyper::rt::lazy(move || {
let client = Client::builder()
.http2_only(true)
.build_http::<hyper::Body>();
let uri = addr_str let uri = addr_str
.parse::<hyper::Uri>() .parse::<hyper::Uri>()
.expect("server addr should parse"); .expect("server addr should parse");
@@ -379,7 +384,7 @@ mod response_body_lengths {
}) })
.map(|_| ()) .map(|_| ())
.map_err(|_e| ()) .map_err(|_e| ())
})); })).unwrap();
} }
#[test] #[test]
@@ -393,8 +398,11 @@ mod response_body_lengths {
.header("content-length", "10") .header("content-length", "10")
.body("Hello, World!"); .body("Hello, World!");
hyper::rt::run(hyper::rt::lazy(move || { let mut rt = Runtime::new().expect("rt new");
let client: Client<_, hyper::Body> = Client::builder().http2_only(true).build_http(); rt.block_on(hyper::rt::lazy(move || {
let client = Client::builder()
.http2_only(true)
.build_http::<hyper::Body>();
let uri = addr_str let uri = addr_str
.parse::<hyper::Uri>() .parse::<hyper::Uri>()
.expect("server addr should parse"); .expect("server addr should parse");
@@ -1796,9 +1804,10 @@ fn serve_with_options(options: ServeOptions) -> Serve {
let fut = spawn_all let fut = spawn_all
.select(shutdown_rx) .select(shutdown_rx)
.then(|_| Ok(())); .then(|_| Ok::<(), ()>(()));
tokio::run(fut); let mut rt = Runtime::new().expect("rt new");
rt.block_on(fut).unwrap();
}).expect("thread spawn"); }).expect("thread spawn");
let addr = addr_rx.recv().expect("server addr rx"); let addr = addr_rx.recv().expect("server addr rx");