Files
irtt-rs/crates/irtt-integration-tests/tests/fill_wire_bytes.rs
T
Nils Andreas Svee 1753e91d5f fix(tests): break the irtt-client/irtt-server dev-dependency cycle
irtt-client and irtt-server mutually dev-depended on each other for
cross-crate integration tests. That cycle blocks `cargo publish` for
either crate whenever the other doesn't already exist on the registry
at the required version, which is exactly the situation for a crate's
first-ever release (irtt-server has never been published before).

Introduce a new `irtt-integration-tests` crate (publish = false, no
library target) to own tests whose actual subject is the interaction
between two or more irtt-* production crates:

  crate-local behavior          -> crate's own tests/
  cross-crate/system behavior   -> irtt-integration-tests

Move every test that imports both irtt_client and irtt_server there:
the client-side support harness (hmac, large_packets, protocol_options,
fill_negotiation) and the server-side real-socket tests that drive a
real AsyncClient against a real Server (async_client, negotiation_policy,
fill_wire_bytes, traffic_class, wildcard_source). server_set.rs stays in
irtt-server/tests since it only uses irtt_proto as test machinery to
drive irtt-server directly, which is a normal one-directional test
dependency, not a peer relationship.

irtt-server's dev-dependency on irtt-client is dropped entirely now
that nothing under crates/irtt-server/tests needs it, which fully
breaks the cycle from that side.

irtt-client keeps a one-directional dev-dependency on irtt-server: a
handful of white-box unit tests in src/async_client/tests.rs assert on
private AsyncClient internals (socket, remote, test_hooks) while also
needing a real in-tree server for blocking/async equivalence checks, so
they can't move to an external crate without losing that access. Their
InTreeServer helper is duplicated locally rather than shared, matching
the existing precedent of irtt-cli's own tests/support/in_tree_server.rs.
2026-08-17 09:49:32 +07:00

217 lines
7.1 KiB
Rust

//! A negotiated fill over a real socket.
//!
//! The core tests are authoritative for fill bytes; this exists to prove the
//! whole path — negotiation, session, echo reply, UDP — puts the requested
//! pattern on the wire. It drives the server with the production protocol codecs
//! over a plain Tokio socket rather than through `AsyncClient`, because a
//! client's reply payload is not part of its event API and exposing it merely to
//! be asserted here would be the wrong trade.
use std::time::Duration;
use irtt_client::{
AsyncClient, ClientConfig, NegotiationPolicy, NegotiationRestriction, OpenOutcome, SocketConfig,
};
use irtt_proto::{
decode_echo_reply, decode_open_reply, echo_header_len, encode_request, Clock, Params,
ReceivedStats, RequestToEncode, ServerFill, StampAt,
};
use irtt_server::{Server, ServerConfig};
use tokio::{net::UdpSocket, sync::oneshot, time::timeout};
const DEADBEEF: &[u8] = &[0xde, 0xad, 0xbe, 0xef];
#[tokio::test(flavor = "current_thread")]
async fn a_negotiated_pattern_reaches_the_wire() {
timeout(Duration::from_secs(2), exercise_patterned_session())
.await
.expect("the fill integration exceeded its bounded runtime");
}
async fn exercise_patterned_session() {
let mut server = Server::bind("127.0.0.1:0".parse().unwrap(), ServerConfig::default())
.await
.unwrap();
let server_addr = server.local_addr().unwrap();
let (shutdown_tx, shutdown_rx) = oneshot::channel();
let server_task = tokio::spawn(async move {
server
.run(async {
let _ = shutdown_rx.await;
})
.await
});
let socket = UdpSocket::bind("127.0.0.1:0").await.unwrap();
socket.connect(server_addr).await.unwrap();
let requested = requested_params(24);
socket
.send(
&encode_request(
RequestToEncode::Open {
params: &requested,
no_test: false,
},
None,
)
.unwrap(),
)
.await
.unwrap();
let reply = decode_open_reply(&receive(&socket).await, None).unwrap();
let negotiated = reply.params;
assert_eq!(
negotiated.server_fill, requested.server_fill,
"a valid descriptor is returned unchanged, so strict negotiation holds"
);
// The request carries its own payload bytes, none of which may come back.
socket
.send(
&encode_request(
RequestToEncode::Echo {
token: reply.token,
sequence: 0,
params: &negotiated,
payload: &[0xa5; 24],
},
None,
)
.unwrap(),
)
.await
.unwrap();
let packet = receive(&socket).await;
let echo = decode_echo_reply(&packet, &negotiated, None).unwrap();
assert_eq!(packet.len() as i64, negotiated.length);
assert_eq!(
echo.payload,
DEADBEEF
.iter()
.copied()
.cycle()
.take(24)
.collect::<Vec<_>>()
);
socket
.send(&encode_request(RequestToEncode::Close { token: reply.token }, None).unwrap())
.await
.unwrap();
shutdown_tx.send(()).unwrap();
server_task.await.unwrap().unwrap();
}
#[tokio::test(flavor = "current_thread")]
async fn a_client_sees_the_fallback_as_a_negotiation_restriction() {
timeout(Duration::from_secs(2), exercise_fallback_negotiation())
.await
.expect("the negotiation integration exceeded its bounded runtime");
}
/// The fallback is deliberately visible to a client rather than hidden: a
/// descriptor this server could not honor comes back as the default one, which a
/// strict client refuses and a loose client accepts with a restriction recorded.
async fn exercise_fallback_negotiation() {
let mut server = Server::bind("127.0.0.1:0".parse().unwrap(), ServerConfig::default())
.await
.unwrap();
let server_addr = server.local_addr().unwrap();
let (shutdown_tx, shutdown_rx) = oneshot::channel();
let server_task = tokio::spawn(async move {
server
.run(async {
let _ = shutdown_rx.await;
})
.await
});
// `ClientConfig` accepts any non-empty descriptor within the wire bound, so
// an unknown one genuinely reaches the server.
let config = |policy| ClientConfig {
server_addr: server_addr.to_string(),
duration: Some(Duration::from_secs(1)),
interval: Duration::from_millis(100),
length: 64,
server_fill: Some("bogus".to_owned()),
negotiation_policy: policy,
open_timeouts: vec![Duration::from_millis(200)],
socket_config: SocketConfig {
recv_timeout: Some(Duration::from_millis(200)),
..SocketConfig::default()
},
probe_timeout: Duration::from_millis(200),
..ClientConfig::default()
};
let mut strict = AsyncClient::connect(config(NegotiationPolicy::Strict))
.await
.unwrap();
let rejected = strict
.open()
.await
.expect_err("a strict client must refuse the changed fill");
assert!(
rejected.to_string().contains("fill"),
"the restriction names the fill: {rejected}"
);
let mut loose = AsyncClient::connect(config(NegotiationPolicy::Loose))
.await
.unwrap();
match loose.open().await.unwrap() {
OpenOutcome::Started { negotiated, .. } => {
assert_eq!(
negotiated
.params
.server_fill
.map(|fill| fill.value)
.as_deref(),
Some("pattern:69727474"),
"the server reports the default descriptor it fell back to"
);
assert!(negotiated
.restrictions
.contains(&NegotiationRestriction::ServerFillChanged));
}
OpenOutcome::NoTestCompleted { .. } => panic!("normal client unexpectedly ran no-test"),
}
loose.close().await.unwrap();
shutdown_tx.send(()).unwrap();
server_task.await.unwrap().unwrap();
}
/// Params requesting a `deadbeef` fill and exactly `payload_len` payload bytes.
fn requested_params(payload_len: usize) -> Params {
let mut params = Params {
protocol_version: 1,
duration_ns: 1_000_000_000,
interval_ns: 100_000_000,
length: 0,
received_stats: ReceivedStats::Both,
stamp_at: StampAt::Both,
clock: Clock::Both,
dscp: 0,
server_fill: Some(ServerFill {
value: "pattern:deadbeef".to_owned(),
}),
};
params.length = (echo_header_len(false, &params) + payload_len) as i64;
params
}
/// One datagram, with a bounded wait so a lost reply fails rather than hangs.
async fn receive(socket: &UdpSocket) -> Vec<u8> {
let mut buffer = vec![0; 2048];
let read = timeout(Duration::from_secs(1), socket.recv(&mut buffer))
.await
.expect("the server must answer within the test's bound")
.unwrap();
buffer.truncate(read);
buffer
}