talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Remove MockStream (#923)

Browse Source
This commit is contained in:
Lucio Franco
2022-02-22 16:21:39 -05:00
committed by GitHub
parent a197c20469
commit d4973642da
7 changed files with 20 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/compression/src/bidirectional_stream.rs
+1 -3
View File
@@ -36,9 +36,7 @@ async fn client_enabled_server_enabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
tests/compression/src/client_stream.rs
+4 -12
View File
@@ -27,9 +27,7 @@ async fn client_enabled_server_enabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -73,9 +71,7 @@ async fn client_disabled_server_enabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -102,9 +98,7 @@ async fn client_enabled_server_disabled() {
tokio::spawn(async move { tokio::spawn(async move {
Server::builder() Server::builder()
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
}); });
@@ -147,9 +141,7 @@ async fn compressing_response_from_client_stream() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
tests/compression/src/compressing_request.rs
+3 -9
View File
@@ -29,9 +29,7 @@ async fn client_enabled_server_enabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -60,9 +58,7 @@ async fn client_enabled_server_disabled() {
tokio::spawn(async move { tokio::spawn(async move {
Server::builder() Server::builder()
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
}); });
@@ -98,9 +94,7 @@ async fn client_mark_compressed_without_header_server_enabled() {
async move { async move {
Server::builder() Server::builder()
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
tests/compression/src/compressing_response.rs
+7 -21
View File
@@ -51,9 +51,7 @@ async fn client_enabled_server_enabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -93,9 +91,7 @@ async fn client_enabled_server_disabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -159,9 +155,7 @@ async fn client_disabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -198,9 +192,7 @@ async fn server_replying_with_unsupported_encoding() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
}); });
@@ -241,9 +233,7 @@ async fn disabling_compression_on_single_response() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -283,9 +273,7 @@ async fn disabling_compression_on_response_but_keeping_compression_on_stream() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -340,9 +328,7 @@ async fn disabling_compression_on_response_from_client_stream() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
tests/compression/src/lib.rs
+1 -1
View File
@@ -1,7 +1,7 @@
#![allow(unused_imports)] #![allow(unused_imports)]
use self::util::*; use self::util::*;
use crate::util::{mock_io_channel, MockStream}; use crate::util::mock_io_channel;
use futures::{Stream, StreamExt}; use futures::{Stream, StreamExt};
use std::convert::TryFrom; use std::convert::TryFrom;
use std::{ use std::{
tests/compression/src/server_stream.rs
+3 -9
View File
@@ -24,9 +24,7 @@ async fn client_enabled_server_enabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -78,9 +76,7 @@ async fn client_disabled_server_enabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
@@ -125,9 +121,7 @@ async fn client_enabled_server_disabled() {
.into_inner(), .into_inner(),
) )
.add_service(svc) .add_service(svc)
.serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)]))
MockStream(server),
)]))
.await .await
.unwrap(); .unwrap();
} }
tests/compression/src/util.rs
+1 -38
View File
@@ -87,43 +87,6 @@ pub fn measure_request_body_size_layer(
}) })
} }
#[derive(Debug)]
pub struct MockStream(pub tokio::io::DuplexStream);
impl Connected for MockStream {
type ConnectInfo = ();
fn connect_info(&self) -> Self::ConnectInfo {}
}
impl AsyncRead for MockStream {
fn poll_read(
mut self: Pin<&mut Self>,
cx: &mut Context<'_>,
buf: &mut ReadBuf<'_>,
) -> Poll<std::io::Result<()>> {
Pin::new(&mut self.0).poll_read(cx, buf)
}
}
impl AsyncWrite for MockStream {
fn poll_write(
mut self: Pin<&mut Self>,
cx: &mut Context<'_>,
buf: &[u8],
) -> Poll<std::io::Result<usize>> {
Pin::new(&mut self.0).poll_write(cx, buf)
}
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<()>> {
Pin::new(&mut self.0).poll_flush(cx)
}
fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<()>> {
Pin::new(&mut self.0).poll_shutdown(cx)
}
}
#[allow(dead_code)] #[allow(dead_code)]
pub async fn mock_io_channel(client: tokio::io::DuplexStream) -> Channel { pub async fn mock_io_channel(client: tokio::io::DuplexStream) -> Channel {
let mut client = Some(client); let mut client = Some(client);
@@ -132,7 +95,7 @@ pub async fn mock_io_channel(client: tokio::io::DuplexStream) -> Channel {
.unwrap() .unwrap()
.connect_with_connector(service_fn(move |_: Uri| { .connect_with_connector(service_fn(move |_: Uri| {
let client = client.take().unwrap(); let client = client.take().unwrap();
async move { Ok::<_, std::io::Error>(MockStream(client)) } async move { Ok::<_, std::io::Error>(client) }
})) }))
.await .await
.unwrap() .unwrap()