Move the increments of retransmittable-on-wire counters to when the alarm fires in retransmittable-on-wire mode.
Protected by FLAGS_quic_reloadable_flag_quic_use_ping_manager2.
PiperOrigin-RevId: 447876160
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index 0da0673..692e3ef 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -7185,7 +7185,7 @@
}
TEST_P(QuicConnectionTest, RetransmittableOnWireSendFirstPacket) {
- if (!GetQuicReloadableFlag(quic_use_ping_manager) ||
+ if (!GetQuicReloadableFlag(quic_use_ping_manager2) ||
!VersionHasIetfQuicFrames(connection_.version().transport_version)) {
return;
}
@@ -7231,7 +7231,7 @@
}
TEST_P(QuicConnectionTest, RetransmittableOnWireSendRandomBytes) {
- if (!GetQuicReloadableFlag(quic_use_ping_manager) ||
+ if (!GetQuicReloadableFlag(quic_use_ping_manager2) ||
!VersionHasIetfQuicFrames(connection_.version().transport_version)) {
return;
}
@@ -7280,7 +7280,7 @@
TEST_P(QuicConnectionTest,
RetransmittableOnWireSendRandomBytesWithWriterBlocked) {
- if (!GetQuicReloadableFlag(quic_use_ping_manager) ||
+ if (!GetQuicReloadableFlag(quic_use_ping_manager2) ||
!VersionHasIetfQuicFrames(connection_.version().transport_version)) {
return;
}
@@ -8250,6 +8250,8 @@
peer_creator_.packet_number() + 1);
EXPECT_EQ(initial_retransmittable_on_wire_timeout,
connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow());
+ clock_.AdvanceTime(initial_retransmittable_on_wire_timeout);
+ connection_.GetPingAlarm()->Fire();
// Verify the count of consecutive aggressive pings is reset.
for (int i = 0; i < max_aggressive_retransmittable_on_wire_ping_count; i++) {
