From 8bd63b07b3c8078325c65b6f042c6efad80c2ace Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Wed, 24 Feb 2021 04:50:49 +0600
Subject: [PATCH] Make TestServer::connect() async

---
 ntex-codec/src/framed.rs | 1 +
 ntex/CHANGES.md          | 4 ++++
 ntex/src/server/test.rs  | 7 +++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ntex-codec/src/framed.rs b/ntex-codec/src/framed.rs
index 9fda0ba6..534c51a1 100644
--- a/ntex-codec/src/framed.rs
+++ b/ntex-codec/src/framed.rs
@@ -260,6 +260,7 @@ where
                     }
                 }
             }
+            log::trace!("flushed {} bytes", written);
 
             // remove written data
             if written == len {
diff --git a/ntex/CHANGES.md b/ntex/CHANGES.md
index 1e9123c3..bd235e84 100644
--- a/ntex/CHANGES.md
+++ b/ntex/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.0-b.2] - 2021-02-24
+
+* server: Make TestServer::connect() async
+
 ## [0.3.0-b.1] - 2021-02-24
 
 * Migrate to tokio 1.x
diff --git a/ntex/src/server/test.rs b/ntex/src/server/test.rs
index a061b026..d884cea7 100644
--- a/ntex/src/server/test.rs
+++ b/ntex/src/server/test.rs
@@ -1,6 +1,5 @@
 //! Test server
-use std::sync::mpsc;
-use std::{io, net, thread};
+use std::{io, net, sync::mpsc, thread};
 
 use socket2::{Domain, SockAddr, Socket, Type};
 
@@ -107,8 +106,8 @@ impl TestServer {
     }
 
     /// Connect to server, return TcpStream
-    pub fn connect(&self) -> std::io::Result<TcpStream> {
-        TcpStream::from_std(net::TcpStream::connect(self.addr)?)
+    pub async fn connect(&self) -> io::Result<TcpStream> {
+        TcpStream::connect(self.addr).await
     }
 
     /// Stop http server