Skip to content

Commit

Permalink
cfg UnixListener tests for unix (#3085)
Browse files Browse the repository at this point in the history
  • Loading branch information
2ndDerivative authored Dec 21, 2024
1 parent 9cd5cc4 commit 8af2f27
Showing 1 changed file with 19 additions and 3 deletions.
22 changes: 19 additions & 3 deletions axum/src/serve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -415,15 +415,20 @@ mod tests {
use axum_core::{body::Body, extract::Request};
use http::StatusCode;
use hyper_util::rt::TokioIo;
#[cfg(unix)]
use tokio::net::UnixListener;
use tokio::{
io::{self, AsyncRead, AsyncWrite},
net::{TcpListener, UnixListener},
net::TcpListener,
};

use super::{serve, IncomingStream, Listener};
#[cfg(unix)]
use super::IncomingStream;
use super::{serve, Listener};
#[cfg(unix)]
use crate::extract::connect_info::Connected;
use crate::{
body::to_bytes,
extract::connect_info::Connected,
handler::{Handler, HandlerWithoutStateExt},
routing::get,
serve::ListenerExt,
Expand All @@ -435,6 +440,7 @@ mod tests {
#[derive(Clone, Debug)]
struct UdsConnectInfo;

#[cfg(unix)]
impl Connected<IncomingStream<'_, UnixListener>> for UdsConnectInfo {
fn connect_info(_stream: IncomingStream<'_, UnixListener>) -> Self {
Self
Expand All @@ -458,6 +464,7 @@ mod tests {
serve(tcp_nodelay_listener().await, router.clone())
.await
.unwrap();
#[cfg(unix)]
serve(UnixListener::bind("").unwrap(), router.clone());

serve(
Expand All @@ -468,6 +475,7 @@ mod tests {
tcp_nodelay_listener().await,
router.clone().into_make_service(),
);
#[cfg(unix)]
serve(
UnixListener::bind("").unwrap(),
router.clone().into_make_service(),
Expand All @@ -485,6 +493,7 @@ mod tests {
.clone()
.into_make_service_with_connect_info::<std::net::SocketAddr>(),
);
#[cfg(unix)]
serve(
UnixListener::bind("").unwrap(),
router.into_make_service_with_connect_info::<UdsConnectInfo>(),
Expand All @@ -493,6 +502,7 @@ mod tests {
// method router
serve(TcpListener::bind(addr).await.unwrap(), get(handler));
serve(tcp_nodelay_listener().await, get(handler));
#[cfg(unix)]
serve(UnixListener::bind("").unwrap(), get(handler));

serve(
Expand All @@ -503,6 +513,7 @@ mod tests {
tcp_nodelay_listener().await,
get(handler).into_make_service(),
);
#[cfg(unix)]
serve(
UnixListener::bind("").unwrap(),
get(handler).into_make_service(),
Expand All @@ -516,6 +527,7 @@ mod tests {
tcp_nodelay_listener().await,
get(handler).into_make_service_with_connect_info::<std::net::SocketAddr>(),
);
#[cfg(unix)]
serve(
UnixListener::bind("").unwrap(),
get(handler).into_make_service_with_connect_info::<UdsConnectInfo>(),
Expand All @@ -527,20 +539,23 @@ mod tests {
handler.into_service(),
);
serve(tcp_nodelay_listener().await, handler.into_service());
#[cfg(unix)]
serve(UnixListener::bind("").unwrap(), handler.into_service());

serve(
TcpListener::bind(addr).await.unwrap(),
handler.with_state(()),
);
serve(tcp_nodelay_listener().await, handler.with_state(()));
#[cfg(unix)]
serve(UnixListener::bind("").unwrap(), handler.with_state(()));

serve(
TcpListener::bind(addr).await.unwrap(),
handler.into_make_service(),
);
serve(tcp_nodelay_listener().await, handler.into_make_service());
#[cfg(unix)]
serve(UnixListener::bind("").unwrap(), handler.into_make_service());

serve(
Expand All @@ -551,6 +566,7 @@ mod tests {
tcp_nodelay_listener().await,
handler.into_make_service_with_connect_info::<std::net::SocketAddr>(),
);
#[cfg(unix)]
serve(
UnixListener::bind("").unwrap(),
handler.into_make_service_with_connect_info::<UdsConnectInfo>(),
Expand Down

0 comments on commit 8af2f27

Please sign in to comment.