use unused port for tests

Author: yoshuawuyts

Cargo.toml

@@ -62,6 +62,7 @@ structopt = "0.3.3"
 surf = "2.0.0-alpha.1"
 futures = "0.3.1"
 femme = "1.3.0"
+portpicker = "0.1.0"
 
 [[test]]
 name = "nested"

tests/chunked-encode-large.rs

@@ -68,7 +68,7 @@ const TEXT: &'static str = concat![
 
 #[async_std::test]
 async fn chunked_large() -> Result<(), http_types::Error> {
-    let bind = test_utils::find_port().await;
+    let port = test_utils::find_port().await;
     let server = task::spawn(async move {
         let mut app = tide::new();
         app.at("/").get(|mut _req: tide::Request<()>| async {
@@ -78,13 +78,13 @@ async fn chunked_large() -> Result<(), http_types::Error> {
                 .set_header(headers::CONTENT_TYPE, "text/plain; charset=utf-8");
             Ok(res)
         });
-        app.listen(&bind).await?;
+        app.listen(("localhost", port)).await?;
         Result::<(), http_types::Error>::Ok(())
     });
 
     let client = task::spawn(async move {
         task::sleep(Duration::from_millis(100)).await;
-        let mut res = surf::get(format!("http://{}", bind)).await?;
+        let mut res = surf::get(format!("http://localhost:{}", port)).await?;
         assert_eq!(res.status(), 200);
         assert_eq!(
             res.header(&"transfer-encoding".parse().unwrap()),

tests/chunked-encode-small.rs

@@ -27,13 +27,13 @@ async fn chunked_large() -> Result<(), http_types::Error> {
                 .set_header(headers::CONTENT_TYPE, "text/plain; charset=utf-8");
             Ok(res)
         });
-        app.listen(&port).await?;
+        app.listen(("localhost", port)).await?;
         Result::<(), http_types::Error>::Ok(())
     });
 
     let client = task::spawn(async move {
         task::sleep(Duration::from_millis(100)).await;
-        let mut res = surf::get(format!("http://{}", port)).await?;
+        let mut res = surf::get(format!("http://localhost:{}", port)).await?;
         assert_eq!(res.status(), 200);
         assert_eq!(
             res.header(&"transfer-encoding".parse().unwrap()),

tests/server.rs

@@ -17,13 +17,13 @@ fn hello_world() -> Result<(), http_types::Error> {
                 let res = Response::new(StatusCode::Ok).body_string("says hello".to_string());
                 Ok(res)
             });
-            app.listen(&port).await?;
+            app.listen(("localhost", port)).await?;
             Result::<(), http_types::Error>::Ok(())
         });
 
         let client = task::spawn(async move {
             task::sleep(Duration::from_millis(100)).await;
-            let string = surf::get(format!("http://{}", port))
+            let string = surf::get(format!("http://localhost:{}", port))
                 .body_string("nori".to_string())
                 .recv_string()
                 .await?;
@@ -43,13 +43,13 @@ fn echo_server() -> Result<(), http_types::Error> {
             let mut app = tide::new();
             app.at("/").get(|req| async move { Ok(req) });
 
-            app.listen(&port).await?;
+            app.listen(("localhost", port)).await?;
             Result::<(), http_types::Error>::Ok(())
         });
 
         let client = task::spawn(async move {
             task::sleep(Duration::from_millis(100)).await;
-            let string = surf::get(format!("http://{}", port))
+            let string = surf::get(format!("http://localhost:{}", port))
                 .body_string("chashu".to_string())
                 .recv_string()
                 .await?;
@@ -79,13 +79,13 @@ fn json() -> Result<(), http_types::Error> {
                 let res = Response::new(StatusCode::Ok).body_json(&counter)?;
                 Ok(res)
             });
-            app.listen(&port).await?;
+            app.listen(("localhost", port)).await?;
             Result::<(), http_types::Error>::Ok(())
         });
 
         let client = task::spawn(async move {
             task::sleep(Duration::from_millis(100)).await;
-            let counter: Counter = surf::get(format!("http://{}", &port))
+            let counter: Counter = surf::get(format!("http://localhost:{}", &port))
                 .body_json(&Counter { count: 0 })?
                 .recv_json()
                 .await?;

tests/test_utils.rs

@@ -1,7 +1,5 @@
-pub async fn find_port() -> async_std::net::SocketAddr {
-    async_std::net::TcpListener::bind("localhost:0")
-        .await
-        .unwrap()
-        .local_addr()
-        .unwrap()
+use portpicker::pick_unused_port;
+
+pub async fn find_port() -> u16 {
+    pick_unused_port().expect("No ports free")
 }