From be7ca0415d7d65ebb124d997713773ea12d83786 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Wed, 13 Dec 2017 16:47:07 -0800 Subject: [PATCH] test(server): try to fix windows keep-alive test --- tests/server.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/server.rs b/tests/server.rs index b3a994e8cc..c15ec3ee4f 100644 --- a/tests/server.rs +++ b/tests/server.rs @@ -623,7 +623,9 @@ fn disable_keep_alive_post_request() { tx1.send(()).unwrap(); - let nread = req.read(&mut buf).unwrap(); + // allow a little more time for TCP to notice the FIN + req.set_read_timeout(Some(Duration::from_secs(5))).expect("set_read_timeout 2"); + let nread = req.read(&mut buf).expect("keep-alive reading"); assert_eq!(nread, 0); }); @@ -631,7 +633,7 @@ fn disable_keep_alive_post_request() { .into_future() .map_err(|_| unreachable!()) .and_then(|(item, _incoming)| { - let (socket, _) = item.unwrap(); + let (socket, _) = item.expect("accepted socket"); Http::::new().serve_connection(socket, HelloWorld) .select2(rx1) .then(|r| {