Skip to content

tests: Include integ test Message representation in ring buffer tests #2852

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

Merged
boquan-fang merged 2 commits into from
Oct 14, 2025
Merged

tests: Include integ test Message representation in ring buffer tests #2852

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
31cb0fd
tests: exercise ring buffers with testing message
cnaples79 Oct 8, 2025
aaf54cb
refactor: fixing snapshot
boquan-fang Oct 13, 2025
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
3 changes: 2 additions & 1 deletion quic/s2n-quic-platform/src/io/testing/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl MessageTrait for Message {
let path = self.handle;
let header = datagram::Header {
path,
ecn: Default::default(),
ecn: self.ecn,
};
let payload = self.payload_mut();

Expand Down Expand Up @@ -123,6 +123,7 @@ impl MessageTrait for Message {
}

self.handle = *message.path_handle();
self.ecn = message.ecn();

Ok(len)
}
Expand Down
6 changes: 6 additions & 0 deletions quic/s2n-quic-platform/src/socket/ring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ mod tests {
}

replication_test!(simple_replication, crate::message::simple::Message);
replication_test!(testing_replication, crate::io::testing::message::Message);
#[cfg(s2n_quic_platform_socket_msg)]
replication_test!(msg_replication, crate::message::msg::Message);
#[cfg(s2n_quic_platform_socket_mmsg)]
Expand Down Expand Up @@ -572,6 +573,7 @@ mod tests {
}

send_recv_test!(simple_send_recv, crate::message::simple::Message);
send_recv_test!(testing_send_recv, crate::io::testing::message::Message);
#[cfg(s2n_quic_platform_socket_msg)]
send_recv_test!(msg_send_recv, crate::message::msg::Message);
#[cfg(s2n_quic_platform_socket_mmsg)]
Expand Down Expand Up @@ -618,6 +620,10 @@ mod tests {
}

consumer_modifications_test!(simple_rx_modifications, crate::message::simple::Message);
consumer_modifications_test!(
testing_rx_modifications,
crate::io::testing::message::Message
);
#[cfg(s2n_quic_platform_socket_msg)]
consumer_modifications_test!(msg_rx_modifications, crate::message::msg::Message);
#[cfg(s2n_quic_platform_socket_mmsg)]
Expand Down
4 changes: 0 additions & 4 deletions quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_handshake_self_test__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -557,8 +555,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
4 changes: 0 additions & 4 deletions ...ests/src/tests/snapshots/tests__dc__dc_mtls_handshake_auth_failure_self_test__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -416,8 +414,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
4 changes: 0 additions & 4 deletions .../tests/snapshots/tests__dc__dc_mtls_handshake_client_not_supported_self_test__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -425,8 +423,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
4 changes: 0 additions & 4 deletions quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_self_test__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -570,8 +568,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
4 changes: 0 additions & 4 deletions .../tests/snapshots/tests__dc__dc_mtls_handshake_server_not_supported_self_test__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -420,8 +418,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
4 changes: 0 additions & 4 deletions quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_not_secret_control_packet__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -671,8 +669,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
4 changes: 0 additions & 4 deletions quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_secret_control_packet__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -667,8 +665,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
9 changes: 2 additions & 7 deletions .../s2n-quic-tests/src/tests/snapshots/tests__pto__handshake_pto_timer_is_armed__events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=99.999ms
measure#recovery_metrics.smoothed_rtt=99.999ms
Expand Down Expand Up @@ -428,6 +426,8 @@ count#frame_sent.frame|PING=1
count#frame_sent=1
count#frame_sent.packet|HANDSHAKE=1
count#frame_sent.frame|PADDING=1
count#ecn_state_changed=1
count#ecn_state_changed.state|UNKNOWN=1
count#packet_sent=1
count#packet_sent.kind|HANDSHAKE=1
count#packet_sent.bytes.total=[REDACTED]b
Expand Down Expand Up @@ -630,8 +630,6 @@ count#frame_received.packet|INITIAL=1
count#frame_received.frame|ACK=1
count#ack_range_received=1
count#ack_range_received.packet|INITIAL=1
count#ecn_state_changed=1
count#ecn_state_changed.state|FAILED=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down Expand Up @@ -874,9 +872,6 @@ count#ack_range_sent=1
count#ack_range_sent.packet|HANDSHAKE=1
count#ack_range_sent=1
count#ack_range_sent.packet|HANDSHAKE=1
count#frame_sent=1
count#frame_sent.packet|HANDSHAKE=1
count#frame_sent.frame|PADDING=1
count#recovery_metrics=1
measure#recovery_metrics.min_rtt=100ms
measure#recovery_metrics.smoothed_rtt=100ms
Expand Down
Loading