Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1838)

Unified Diff: net/quic/quic_sent_packet_manager_test.cc

Issue 109993008: Fix QUIC's TCP style retransmission logic to only send a maximum of 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_sent_packet_manager_test.cc
diff --git a/net/quic/quic_sent_packet_manager_test.cc b/net/quic/quic_sent_packet_manager_test.cc
index 0429a26cb7b692a9cf98279703795d49b339e767..168cbf378cf7421d3023964baec1ee6a051688a3 100644
--- a/net/quic/quic_sent_packet_manager_test.cc
+++ b/net/quic/quic_sent_packet_manager_test.cc
@@ -631,7 +631,7 @@ TEST_F(QuicSentPacketManagerTest, DontEarlyRetransmitPacket) {
EXPECT_EQ(3u, QuicSentPacketManagerPeer::GetNackCount(&manager_, 1));
}
-TEST_F(QuicSentPacketManagerTest, NackRetransmit10Packets) {
+TEST_F(QuicSentPacketManagerTest, NackRetransmit2Packets) {
const size_t kNumSentPackets = 20;
// Transmit 20 packets.
for (QuicPacketSequenceNumber i = 1; i <= kNumSentPackets; ++i) {
@@ -651,18 +651,18 @@ TEST_F(QuicSentPacketManagerTest, NackRetransmit10Packets) {
}
EXPECT_CALL(*send_algorithm_,
OnPacketAcked(kNumSentPackets, _, _)).Times(1);
- EXPECT_CALL(*send_algorithm_, OnPacketLost(_, _)).Times(10);
- EXPECT_CALL(*send_algorithm_, OnPacketAbandoned(_, _)).Times(10);
+ EXPECT_CALL(*send_algorithm_, OnPacketLost(_, _)).Times(2);
+ EXPECT_CALL(*send_algorithm_, OnPacketAbandoned(_, _)).Times(2);
SequenceNumberSet retransmissions =
manager_.OnIncomingAckFrame(received_info, clock_.Now());
- EXPECT_EQ(10u, retransmissions.size());
+ EXPECT_EQ(2u, retransmissions.size());
for (size_t i = 1; i < kNumSentPackets; ++i) {
EXPECT_EQ(kNumSentPackets - i,
QuicSentPacketManagerPeer::GetNackCount(&manager_, i));
}
}
-TEST_F(QuicSentPacketManagerTest, NackRetransmit10PacketsAlternateAcks) {
+TEST_F(QuicSentPacketManagerTest, NackRetransmit2PacketsAlternateAcks) {
const size_t kNumSentPackets = 30;
// Transmit 15 packets of data and 15 ack packets. The send algorithm will
// inform the congestion manager not to save the acks by returning false.
@@ -684,11 +684,11 @@ TEST_F(QuicSentPacketManagerTest, NackRetransmit10PacketsAlternateAcks) {
}
// We never actually get an ack call, since the kNumSentPackets packet was
// not saved.
- EXPECT_CALL(*send_algorithm_, OnPacketLost(_, _)).Times(10);
- EXPECT_CALL(*send_algorithm_, OnPacketAbandoned(_, _)).Times(10);
+ EXPECT_CALL(*send_algorithm_, OnPacketLost(_, _)).Times(2);
+ EXPECT_CALL(*send_algorithm_, OnPacketAbandoned(_, _)).Times(2);
SequenceNumberSet retransmissions =
manager_.OnIncomingAckFrame(received_info, clock_.Now());
- EXPECT_EQ(10u, retransmissions.size());
+ EXPECT_EQ(2u, retransmissions.size());
// Only non-ack packets have a nack count.
for (size_t i = 1; i < kNumSentPackets; i += 2) {
EXPECT_EQ(kNumSentPackets - i,
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698