test(client): Re-enable the tests/client.rs test

These tests were temporarily disabled during the migration to the
`std::future::Future` type that's part of the stable Rust now.

This commit updates the tests after the breaking changes and makes them
pass again.

Author: jakubadamw

Cargo.toml

@@ -38,16 +38,18 @@ pin-utils = "0.1.0-alpha.4"
 time = "0.1"
 tokio = { git = "https://github.com/tokio-rs/tokio", optional = true, default-features = false, features = ["rt-full"] }
 tokio-buf = "0.1"
+tokio-current-thread = { git = "https://github.com/tokio-rs/tokio" }
 tokio-executor = { git = "https://github.com/tokio-rs/tokio" }
 tokio-io = { git = "https://github.com/tokio-rs/tokio" }
 tokio-reactor = { git = "https://github.com/tokio-rs/tokio", optional = true }
 tokio-sync = { git = "https://github.com/tokio-rs/tokio" }
-tokio-tcp = { git = "https://github.com/tokio-rs/tokio", optional = true }
+tokio-tcp = { git = "https://github.com/tokio-rs/tokio", optional = true, features = ["async-traits"] }
 tokio-threadpool = { git = "https://github.com/tokio-rs/tokio", optional = true }
 tokio-timer = { git = "https://github.com/tokio-rs/tokio", optional = true }
 want = { git = "https://github.com/seanmonstar/want", branch = "std-future" }
 
 [dev-dependencies]
+matches = "0.1"
 num_cpus = "1.0"
 pretty_env_logger = "0.3"
 spmc = "0.2"

src/body/body.rs

@@ -553,15 +553,16 @@ mod tests {
     // FIXME: re-implement tests with `async/await`, this import should
     // trigger a warning to remind us
     use crate::Error;
+    use futures_util::try_stream::TryStreamExt;
+    use tokio::runtime::current_thread::Runtime;
 
-    /*
     use super::*;
     #[test]
     fn test_body_stream_concat() {
         let body = Body::from("hello world");
 
-        let total = body.concat2().wait().unwrap();
+        let mut rt = Runtime::new().unwrap();
+        let total = rt.block_on(body.try_concat()).unwrap();
         assert_eq!(total.as_ref(), b"hello world");
     }
-    */
 }