Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(iroh-net): disable flaky MagicEndpoint tests #1184

Merged
merged 2 commits into from
Jul 7, 2023
Merged

test(iroh-net): disable flaky MagicEndpoint tests #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9036a7b
test(iroh-net): disable flaky MagicEndpoint tests
dignifiedquire Jul 7, 2023
f75e814
fixup
dignifiedquire Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions iroh-net/src/hp/magicsock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ pub use self::conn::{Callbacks, Conn, Options};
pub use self::endpoint::EndpointInfo;
pub use self::timer::Timer;

#[cfg(test)]
pub(crate) use conn::tests as conn_tests;
// #[cfg(test)]
// pub(crate) use conn::tests as conn_tests;
302 changes: 152 additions & 150 deletions iroh-net/src/magic_endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,153 +398,155 @@ pub async fn get_peer_id(connection: &quinn::Connection) -> anyhow::Result<PeerI
}
}

#[cfg(test)]
mod test {
use futures::future::BoxFuture;

use super::{accept_conn, MagicEndpoint};
use crate::hp::magicsock::conn_tests::{run_derp_and_stun, setup_logging};

const TEST_ALPN: &[u8] = b"n0/iroh/test";

async fn setup_pair() -> anyhow::Result<(
MagicEndpoint,
MagicEndpoint,
impl FnOnce() -> BoxFuture<'static, ()>,
)> {
let (derp_map, cleanup) = run_derp_and_stun([127, 0, 0, 1].into()).await?;

let ep1 = MagicEndpoint::builder()
.alpns(vec![TEST_ALPN.to_vec()])
.derp_map(Some(derp_map.clone()))
.bind(0)
.await?;

let ep2 = MagicEndpoint::builder()
.alpns(vec![TEST_ALPN.to_vec()])
.derp_map(Some(derp_map.clone()))
.bind(0)
.await?;

Ok((ep1, ep2, cleanup))
}

#[tokio::test]
async fn magic_endpoint_connect_close() {
setup_logging();
let (ep1, ep2, cleanup) = setup_pair().await.unwrap();
let peer_id_1 = ep1.peer_id();

let accept = tokio::spawn(async move {
let conn = ep1.accept().await.unwrap();
let (_peer_id, _alpn, conn) = accept_conn(conn).await.unwrap();
let mut stream = conn.accept_uni().await.unwrap();
ep1.close(23u8.into(), b"badbadnotgood").await.unwrap();
let res = conn.accept_uni().await;
assert_eq!(res.unwrap_err(), quinn::ConnectionError::LocallyClosed);

let res = stream.read_to_end(10).await;
assert_eq!(
res.unwrap_err(),
quinn::ReadToEndError::Read(quinn::ReadError::ConnectionLost(
quinn::ConnectionError::LocallyClosed
))
);
});

let conn = ep2.connect(peer_id_1, TEST_ALPN, &[]).await.unwrap();
// open a first stream - this does not error before we accept one stream before closing
// on the other peer
let mut stream = conn.open_uni().await.unwrap();
// now the other peer closed the connection.
stream.write_all(b"hi").await.unwrap();
// now the other peer closed the connection.
let expected_err = quinn::ConnectionError::ApplicationClosed(quinn::ApplicationClose {
error_code: 23u8.into(),
reason: b"badbadnotgood".to_vec().into(),
});
let err = conn.closed().await;
assert_eq!(err, expected_err);

let res = stream.finish().await;
assert_eq!(
res.unwrap_err(),
quinn::WriteError::ConnectionLost(expected_err.clone())
);

let res = conn.open_uni().await;
assert_eq!(res.unwrap_err(), expected_err);

accept.await.unwrap();
cleanup().await;
}

#[tokio::test]
async fn magic_endpoint_bidi_send_recv() {
setup_logging();
let (ep1, ep2, cleanup) = setup_pair().await.unwrap();

let peer_id_1 = ep1.peer_id();
eprintln!("peer id 1 {peer_id_1}");
let peer_id_2 = ep2.peer_id();
eprintln!("peer id 2 {peer_id_2}");

let endpoint = ep2.clone();
let p2_connect = tokio::spawn(async move {
let conn = endpoint.connect(peer_id_1, TEST_ALPN, &[]).await.unwrap();
let (mut send, mut recv) = conn.open_bi().await.unwrap();
send.write_all(b"hello").await.unwrap();
send.finish().await.unwrap();
let m = recv.read_to_end(100).await.unwrap();
assert_eq!(&m, b"world");
});

let endpoint = ep1.clone();
let p1_accept = tokio::spawn(async move {
let conn = endpoint.accept().await.unwrap();
let (peer_id, alpn, conn) = accept_conn(conn).await.unwrap();
assert_eq!(peer_id, peer_id_2);
assert_eq!(alpn.as_bytes(), TEST_ALPN);

let (mut send, mut recv) = conn.accept_bi().await.unwrap();
let m = recv.read_to_end(100).await.unwrap();
assert_eq!(m, b"hello");

send.write_all(b"world").await.unwrap();
send.finish().await.unwrap();
});

let endpoint = ep1.clone();
let p1_connect = tokio::spawn(async move {
let conn = endpoint.connect(peer_id_2, TEST_ALPN, &[]).await.unwrap();
let (mut send, mut recv) = conn.open_bi().await.unwrap();
send.write_all(b"ola").await.unwrap();
send.finish().await.unwrap();
let m = recv.read_to_end(100).await.unwrap();
assert_eq!(&m, b"mundo");
});

let endpoint = ep2.clone();
let p2_accept = tokio::spawn(async move {
let conn = endpoint.accept().await.unwrap();
let (peer_id, alpn, conn) = accept_conn(conn).await.unwrap();
assert_eq!(peer_id, peer_id_1);
assert_eq!(alpn.as_bytes(), TEST_ALPN);

let (mut send, mut recv) = conn.accept_bi().await.unwrap();
let m = recv.read_to_end(100).await.unwrap();
assert_eq!(m, b"ola");

send.write_all(b"mundo").await.unwrap();
send.finish().await.unwrap();
});

p1_accept.await.unwrap();
p2_connect.await.unwrap();

p2_accept.await.unwrap();
p1_connect.await.unwrap();

cleanup().await;
}
}
// TODO: Reenable when not flaky
// https://github.com/n0-computer/iroh/issues/1183
// #[cfg(test)]
// mod test {
// use futures::future::BoxFuture;

// use super::{accept_conn, MagicEndpoint};
// use crate::hp::magicsock::conn_tests::{run_derp_and_stun, setup_logging};

// const TEST_ALPN: &[u8] = b"n0/iroh/test";

// async fn setup_pair() -> anyhow::Result<(
// MagicEndpoint,
// MagicEndpoint,
// impl FnOnce() -> BoxFuture<'static, ()>,
// )> {
// let (derp_map, cleanup) = run_derp_and_stun([127, 0, 0, 1].into()).await?;

// let ep1 = MagicEndpoint::builder()
// .alpns(vec![TEST_ALPN.to_vec()])
// .derp_map(Some(derp_map.clone()))
// .bind(0)
// .await?;

// let ep2 = MagicEndpoint::builder()
// .alpns(vec![TEST_ALPN.to_vec()])
// .derp_map(Some(derp_map.clone()))
// .bind(0)
// .await?;

// Ok((ep1, ep2, cleanup))
// }

// #[tokio::test]
// async fn magic_endpoint_connect_close() {
// setup_logging();
// let (ep1, ep2, cleanup) = setup_pair().await.unwrap();
// let peer_id_1 = ep1.peer_id();

// let accept = tokio::spawn(async move {
// let conn = ep1.accept().await.unwrap();
// let (_peer_id, _alpn, conn) = accept_conn(conn).await.unwrap();
// let mut stream = conn.accept_uni().await.unwrap();
// ep1.close(23u8.into(), b"badbadnotgood").await.unwrap();
// let res = conn.accept_uni().await;
// assert_eq!(res.unwrap_err(), quinn::ConnectionError::LocallyClosed);

// let res = stream.read_to_end(10).await;
// assert_eq!(
// res.unwrap_err(),
// quinn::ReadToEndError::Read(quinn::ReadError::ConnectionLost(
// quinn::ConnectionError::LocallyClosed
// ))
// );
// });

// let conn = ep2.connect(peer_id_1, TEST_ALPN, &[]).await.unwrap();
// // open a first stream - this does not error before we accept one stream before closing
// // on the other peer
// let mut stream = conn.open_uni().await.unwrap();
// // now the other peer closed the connection.
// stream.write_all(b"hi").await.unwrap();
// // now the other peer closed the connection.
// let expected_err = quinn::ConnectionError::ApplicationClosed(quinn::ApplicationClose {
// error_code: 23u8.into(),
// reason: b"badbadnotgood".to_vec().into(),
// });
// let err = conn.closed().await;
// assert_eq!(err, expected_err);

// let res = stream.finish().await;
// assert_eq!(
// res.unwrap_err(),
// quinn::WriteError::ConnectionLost(expected_err.clone())
// );

// let res = conn.open_uni().await;
// assert_eq!(res.unwrap_err(), expected_err);

// accept.await.unwrap();
// cleanup().await;
// }

// #[tokio::test]
// async fn magic_endpoint_bidi_send_recv() {
// setup_logging();
// let (ep1, ep2, cleanup) = setup_pair().await.unwrap();

// let peer_id_1 = ep1.peer_id();
// eprintln!("peer id 1 {peer_id_1}");
// let peer_id_2 = ep2.peer_id();
// eprintln!("peer id 2 {peer_id_2}");

// let endpoint = ep2.clone();
// let p2_connect = tokio::spawn(async move {
// let conn = endpoint.connect(peer_id_1, TEST_ALPN, &[]).await.unwrap();
// let (mut send, mut recv) = conn.open_bi().await.unwrap();
// send.write_all(b"hello").await.unwrap();
// send.finish().await.unwrap();
// let m = recv.read_to_end(100).await.unwrap();
// assert_eq!(&m, b"world");
// });

// let endpoint = ep1.clone();
// let p1_accept = tokio::spawn(async move {
// let conn = endpoint.accept().await.unwrap();
// let (peer_id, alpn, conn) = accept_conn(conn).await.unwrap();
// assert_eq!(peer_id, peer_id_2);
// assert_eq!(alpn.as_bytes(), TEST_ALPN);

// let (mut send, mut recv) = conn.accept_bi().await.unwrap();
// let m = recv.read_to_end(100).await.unwrap();
// assert_eq!(m, b"hello");

// send.write_all(b"world").await.unwrap();
// send.finish().await.unwrap();
// });

// let endpoint = ep1.clone();
// let p1_connect = tokio::spawn(async move {
// let conn = endpoint.connect(peer_id_2, TEST_ALPN, &[]).await.unwrap();
// let (mut send, mut recv) = conn.open_bi().await.unwrap();
// send.write_all(b"ola").await.unwrap();
// send.finish().await.unwrap();
// let m = recv.read_to_end(100).await.unwrap();
// assert_eq!(&m, b"mundo");
// });

// let endpoint = ep2.clone();
// let p2_accept = tokio::spawn(async move {
// let conn = endpoint.accept().await.unwrap();
// let (peer_id, alpn, conn) = accept_conn(conn).await.unwrap();
// assert_eq!(peer_id, peer_id_1);
// assert_eq!(alpn.as_bytes(), TEST_ALPN);

// let (mut send, mut recv) = conn.accept_bi().await.unwrap();
// let m = recv.read_to_end(100).await.unwrap();
// assert_eq!(m, b"ola");

// send.write_all(b"mundo").await.unwrap();
// send.finish().await.unwrap();
// });

// p1_accept.await.unwrap();
// p2_connect.await.unwrap();

// p2_accept.await.unwrap();
// p1_connect.await.unwrap();

// cleanup().await;
// }
// }