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

boquan-fang · cnaples79 · web-flow · commit 73c9278697eb · 2025-10-14T16:57:58.000-07:00
Co-authored-by: Chase Naples &lt;Cnaples79@gmail.com&gt;
diff --git a/quic/s2n-quic-platform/src/io/testing/message.rs b/quic/s2n-quic-platform/src/io/testing/message.rs
@@ -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();
 
@@ -123,6 +123,7 @@ impl MessageTrait for Message {
         }
 
         self.handle = *message.path_handle();
+        self.ecn = message.ecn();
 
         Ok(len)
     }
diff --git a/quic/s2n-quic-platform/src/socket/ring.rs b/quic/s2n-quic-platform/src/socket/ring.rs
@@ -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)]
@@ -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)]
@@ -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)]
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_handshake_self_test__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_handshake_self_test__events.snap
@@ -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
@@ -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
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_auth_failure_self_test__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_auth_failure_self_test__events.snap
@@ -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
@@ -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
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_client_not_supported_self_test__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_client_not_supported_self_test__events.snap
@@ -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
@@ -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
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_self_test__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_self_test__events.snap
@@ -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
@@ -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
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_server_not_supported_self_test__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_mtls_handshake_server_not_supported_self_test__events.snap
@@ -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
@@ -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
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_not_secret_control_packet__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_not_secret_control_packet__events.snap
@@ -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
@@ -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
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_secret_control_packet__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__dc__dc_secret_control_packet__events.snap
@@ -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
@@ -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
diff --git a/quic/s2n-quic-tests/src/tests/snapshots/tests__pto__handshake_pto_timer_is_armed__events.snap b/quic/s2n-quic-tests/src/tests/snapshots/tests__pto__handshake_pto_timer_is_armed__events.snap
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ impl MessageTrait for Message {`
`94`	`94`	`let path = self.handle;`
`95`	`95`	`let header = datagram::Header {`
`96`	`96`	`path,`
`97`		`- ecn: Default::default(),`
	`97`	`+ ecn: self.ecn,`
`98`	`98`	`};`
`99`	`99`	`let payload = self.payload_mut();`
`100`	`100`
`@@ -123,6 +123,7 @@ impl MessageTrait for Message {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`self.handle = *message.path_handle();`
	`126`	`+ self.ecn = message.ecn();`
`126`	`127`
`127`	`128`	`Ok(len)`
`128`	`129`	`}`