forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to tokio 0.3 (#491)

Browse Source
This commit is contained in:
João Oliveira
2020-10-23 18:45:09 +01:00
committed by GitHub
parent 676a068fd4
commit cbbdd305b1
11 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/h2-fuzz/Cargo.toml
View File

@@ -12,4 +12,4 @@ env_logger = { version = "0.5.3", default-features = false }
futures = { version = "0.3", default-features = false, features = ["std"] }
honggfuzz = "0.5"
http = "0.2"
tokio = { version = "0.2", features = [] }
tokio = { version = "0.3", features = [] }

4
tests/h2-support/Cargo.toml
View File

@@ -12,5 +12,5 @@ tracing = "0.1"
tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "chrono", "ansi"] }
futures = { version = "0.3", default-features = false }
http = "0.2"
tokio = { version = "0.2", features = ["time"] }
tokio-test = "0.2"
tokio = { version = "0.3", features = ["time"] }
tokio-test = "0.3"

41
tests/h2-support/src/mock.rs
View File

@@ -6,7 +6,7 @@ use h2::{self, RecvError, SendError};
use futures::future::poll_fn;
use futures::{ready, Stream, StreamExt};
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf};
use super::assert::assert_frame_eq;
use std::pin::Pin;
@@ -147,10 +147,11 @@ impl Handle {
poll_fn(move |cx| {
while buf.has_remaining() {
let res = Pin::new(self.codec.get_mut())
.poll_write_buf(cx, &mut buf)
.poll_write(cx, &mut buf.bytes())
.map_err(|e| panic!("write err={:?}", e));
ready!(res).unwrap();
let n = ready!(res).unwrap();
buf.advance(n);
}
Poll::Ready(())
@@ -294,8 +295,8 @@ impl AsyncRead for Handle {
fn poll_read(
mut self: Pin<&mut Self>,
cx: &mut Context<'_>,
buf: &mut [u8],
) -> Poll<io::Result<usize>> {
buf: &mut ReadBuf,
) -> Poll<io::Result<()>> {
Pin::new(self.codec.get_mut()).poll_read(cx, buf)
}
}
@@ -344,10 +345,10 @@ impl AsyncRead for Mock {
fn poll_read(
self: Pin<&mut Self>,
cx: &mut Context<'_>,
buf: &mut [u8],
) -> Poll<io::Result<usize>> {
buf: &mut ReadBuf,
) -> Poll<io::Result<()>> {
assert!(
buf.len() > 0,
buf.remaining() > 0,
"attempted read with zero length buffer... wut?"
);
@@ -355,18 +356,18 @@ impl AsyncRead for Mock {
if me.rx.is_empty() {
if me.closed {
return Poll::Ready(Ok(0));
return Poll::Ready(Ok(()));
}
me.rx_task = Some(cx.waker().clone());
return Poll::Pending;
}
let n = cmp::min(buf.len(), me.rx.len());
buf[..n].copy_from_slice(&me.rx[..n]);
let n = cmp::min(buf.remaining(), me.rx.len());
buf.put_slice(&me.rx[..n]);
me.rx.drain(..n);
Poll::Ready(Ok(n))
Poll::Ready(Ok(()))
}
}
@@ -427,10 +428,10 @@ impl AsyncRead for Pipe {
fn poll_read(
self: Pin<&mut Self>,
cx: &mut Context<'_>,
buf: &mut [u8],
) -> Poll<io::Result<usize>> {
buf: &mut ReadBuf,
) -> Poll<io::Result<()>> {
assert!(
buf.len() > 0,
buf.remaining() > 0,
"attempted read with zero length buffer... wut?"
);
@@ -438,18 +439,18 @@ impl AsyncRead for Pipe {
if me.tx.is_empty() {
if me.closed {
return Poll::Ready(Ok(0));
return Poll::Ready(Ok(()));
}
me.tx_task = Some(cx.waker().clone());
return Poll::Pending;
}
let n = cmp::min(buf.len(), me.tx.len());
buf[..n].copy_from_slice(&me.tx[..n]);
let n = cmp::min(buf.remaining(), me.tx.len());
buf.put_slice(&me.tx[..n]);
me.tx.drain(..n);
Poll::Ready(Ok(n))
Poll::Ready(Ok(()))
}
}
@@ -479,5 +480,5 @@ impl AsyncWrite for Pipe {
}
pub async fn idle_ms(ms: u64) {
tokio::time::delay_for(Duration::from_millis(ms)).await
tokio::time::sleep(Duration::from_millis(ms)).await
}

2
tests/h2-tests/Cargo.toml
View File

@@ -11,4 +11,4 @@ edition = "2018"
h2-support = { path = "../h2-support" }
tracing = "0.1.13"
futures = { version = "0.3", default-features = false, features = ["alloc"] }
tokio = { version = "0.2", features = ["macros", "tcp"] }
tokio = { version = "0.3", features = ["macros", "net", "rt", "io-util"] }

5
tests/h2-tests/tests/codec_read.rs
View File

@@ -190,6 +190,7 @@ async fn read_continuation_frames() {
#[tokio::test]
async fn update_max_frame_len_at_rest() {
use futures::StreamExt;
use tokio::io::AsyncReadExt;
h2_support::trace_init!();
// TODO: add test for updating max frame length in flight as well?
@@ -211,6 +212,10 @@ async fn update_max_frame_len_at_rest() {
codec.next().await.unwrap().unwrap_err().to_string(),
"frame with invalid size"
);
// drain codec buffer
let mut buf = Vec::new();
codec.get_mut().read_to_end(&mut buf).await.unwrap();
}
#[tokio::test]

4
tests/h2-tests/tests/flow_control.rs
View File

@@ -972,7 +972,7 @@ async fn settings_lowered_capacity_returns_capacity_to_connection() {
//
// A timeout is used here to avoid blocking forever if there is a
// failure
let result = select(rx2, tokio::time::delay_for(Duration::from_secs(5))).await;
let result = select(rx2, tokio::time::sleep(Duration::from_secs(5))).await;
if let Either::Right((_, _)) = result {
panic!("Timed out");
}
@@ -1004,7 +1004,7 @@ async fn settings_lowered_capacity_returns_capacity_to_connection() {
});
// Wait for server handshake to complete.
let result = select(rx1, tokio::time::delay_for(Duration::from_secs(5))).await;
let result = select(rx1, tokio::time::sleep(Duration::from_secs(5))).await;
if let Either::Right((_, _)) = result {
panic!("Timed out");
}

6
tests/h2-tests/tests/hammer.rs
View File

@@ -26,8 +26,8 @@ impl Server {
{
let mk_data = Arc::new(mk_data);
let mut rt = tokio::runtime::Runtime::new().unwrap();
let mut listener = rt
let rt = tokio::runtime::Runtime::new().unwrap();
let listener = rt
.block_on(TcpListener::bind(SocketAddr::from(([127, 0, 0, 1], 0))))
.unwrap();
let addr = listener.local_addr().unwrap();
@@ -140,7 +140,7 @@ fn hammer_client_concurrency() {
})
});
let mut rt = tokio::runtime::Runtime::new().unwrap();
let rt = tokio::runtime::Runtime::new().unwrap();
rt.block_on(tcp);
println!("...done");
}