Fix test failures of examples

Author: Rufflewind

Cargo.toml

@@ -20,6 +20,7 @@ tokio = { version = "0.2.6", features = ["io-util", "io-driver", "stream"] }
 tokio-util = { version = "0.2.0", features = ["codec"] }
 
 [dev-dependencies]
+futures = "0.3.8"
 tokio = { version = "0.2", features = ["full", "io-util"] }
 actix = "0.9.0"
 actix-rt = "1.0.0"

examples/stdin.rs

@@ -15,9 +15,8 @@ async fn main() {
 
     let mut framed = FramedRead::new(file, LinesCodec::new());
 
+    println!("Type something and hit enter!");
     while let Some(got) = framed.next().await {
-        println!("Got this: {:?}", got);
+        println!("Got: {:?}", got);
     }
-
-    println!("Received None, lol");
 }

examples/stdin_actix.rs

@@ -13,9 +13,8 @@ async fn main() {
 
     let mut framed = FramedRead::new(file, LinesCodec::new());
 
+    println!("Type something and hit enter!");
     while let Some(got) = framed.next().await {
-        println!("Got this: {:?}", got);
+        println!("Got: {:?}", got);
     }
-
-    println!("Received None, lol");
 }

examples/stdin_actix_web.rs

@@ -1,6 +1,9 @@
+extern crate futures;
 extern crate tokio;
 extern crate tokio_file_unix;
 
+use futures::{pin_mut, select};
+use futures::future::FutureExt;
 use tokio_util::codec::FramedRead;
 use tokio_util::codec::LinesCodec;
 use crate::tokio::stream::StreamExt;
@@ -14,7 +17,8 @@ async fn index(info: web::Path<String>) -> impl Responder {
 
 #[actix_rt::main]
 async fn main() -> std::io::Result<()> {
-    actix_rt::spawn(async {
+    println!("Type something and hit enter!");
+    let stdin_fut = async {
         let file = tokio_file_unix::raw_stdin().unwrap();
         let file = tokio_file_unix::File::new_nb(file).unwrap();
         let file = file.into_io().unwrap();
@@ -35,10 +39,18 @@ async fn main() -> std::io::Result<()> {
 
             println!("Got bytes: {:?}", String::from_utf8(body.to_vec()).unwrap());
         }
-    });
+        Ok(())
+    }.fuse();
 
-    HttpServer::new(|| App::new().service(index))
+    let server_fut = HttpServer::new(|| App::new().service(index))
         .bind("127.0.0.1:8080")?
-        .start()
-        .await
-}
+        .run()
+        .fuse();
+
+    pin_mut!(stdin_fut, server_fut);
+
+    select! {
+        result = stdin_fut => result,
+        result = server_fut => result,
+    }
+}

tests/run

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 set -eux
-for example in stdin stdin_stream; do
+
+for example in stdin stdin_actix; do
     cat tests/test_input.txt | cargo run --example "${example}" | diff -u tests/test_output.txt -
     cargo run --example "${example}" </dev/null | tail -n +2 | diff -u /dev/null -
 done
-cat tests/test_input.txt | cargo run --example stdin_lines | diff -u tests/test_lines_output.txt -
-cargo run --example stdin_lines </dev/null | tail -n +2 | diff -u /dev/null -
+cat tests/test_actix_web_input.txt | cargo run --example stdin_actix_web | diff -u tests/test_actix_web_output.txt -
+cargo run --example stdin_actix_web </dev/null | tail -n +2 | diff -u /dev/null -
 
 cargo run --example seek
 diff -q tests/seek.txt <(echo aaccccAAbbbbbbbb)

tests/test_actix_web_input.txt

@@ -0,0 +1,3 @@
+the-quick-brown-fox
+jumps-over-the-lazy
+dog

tests/test_actix_web_output.txt

@@ -0,0 +1,7 @@
+Type something and hit enter!
+Sending this: Ok("the-quick-brown-fox")
+Got bytes: "Hello Got this: the-quick-brown-fox"
+Sending this: Ok("jumps-over-the-lazy")
+Got bytes: "Hello Got this: jumps-over-the-lazy"
+Sending this: Ok("dog")
+Got bytes: "Hello Got this: dog"

tests/test_lines_output.txt

@@ -1,4 +1,4 @@
 Type something and hit enter!
-Got: Ok("The quick brown fox\n")
-Got: Ok("jumps over the lazy\n")
+Got: Ok("The quick brown fox")
+Got: Ok("jumps over the lazy")
 Got: Ok("dog.")