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

Unified Diff: net/quic/congestion_control/tcp_cubic_sender_test.cc

Issue 963293002: Remove RevertRetransmissionTimeout from QUIC's SendAlgorithmInterface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Remove_stats_recording_reno_86629919
Patch Set: Created 5 years, 10 months 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/congestion_control/tcp_cubic_sender.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/congestion_control/tcp_cubic_sender_test.cc
diff --git a/net/quic/congestion_control/tcp_cubic_sender_test.cc b/net/quic/congestion_control/tcp_cubic_sender_test.cc
index 6cfa6c101d4c243aaac7a6a666c8d5761c17ca10..2d0f61c2c015cbf9b6f6619559989ff959a99ee0 100644
--- a/net/quic/congestion_control/tcp_cubic_sender_test.cc
+++ b/net/quic/congestion_control/tcp_cubic_sender_test.cc
@@ -250,11 +250,6 @@ TEST_F(TcpCubicSenderTest, SlowStartAckTrain) {
EXPECT_EQ(2 * kDefaultTCPMSS, sender_->GetCongestionWindow());
EXPECT_EQ(expected_send_window / 2 / kDefaultTCPMSS,
sender_->slowstart_threshold());
-
- // Now revert the RTO and ensure the CWND and slowstart threshold revert.
- sender_->RevertRetransmissionTimeout();
- EXPECT_EQ(expected_send_window, sender_->GetCongestionWindow());
- EXPECT_EQ(140u, sender_->slowstart_threshold());
}
TEST_F(TcpCubicSenderTest, SlowStartPacketLoss) {
@@ -421,7 +416,7 @@ TEST_F(TcpCubicSenderTest, SlowStartBurstPacketLossPRR) {
}
}
-TEST_F(TcpCubicSenderTest, RTOCongestionWindowAndRevert) {
+TEST_F(TcpCubicSenderTest, RTOCongestionWindow) {
EXPECT_EQ(kDefaultWindowTCP, sender_->GetCongestionWindow());
EXPECT_EQ(kMaxTcpCongestionWindow, sender_->slowstart_threshold());
@@ -430,11 +425,6 @@ TEST_F(TcpCubicSenderTest, RTOCongestionWindowAndRevert) {
sender_->OnRetransmissionTimeout(true);
EXPECT_EQ(2 * kDefaultTCPMSS, sender_->GetCongestionWindow());
EXPECT_EQ(5u, sender_->slowstart_threshold());
-
- // Now repair the RTO and ensure the slowstart threshold reverts.
- sender_->RevertRetransmissionTimeout();
- EXPECT_EQ(kDefaultWindowTCP, sender_->GetCongestionWindow());
- EXPECT_EQ(kMaxTcpCongestionWindow, sender_->slowstart_threshold());
}
TEST_F(TcpCubicSenderTest, RTOCongestionWindowNoRetransmission) {
@@ -446,27 +436,6 @@ TEST_F(TcpCubicSenderTest, RTOCongestionWindowNoRetransmission) {
EXPECT_EQ(kDefaultWindowTCP, sender_->GetCongestionWindow());
}
-TEST_F(TcpCubicSenderTest, RTOTwiceOnlyHalvesSsthresh) {
- EXPECT_EQ(kDefaultWindowTCP, sender_->GetCongestionWindow());
-
- sender_->OnRetransmissionTimeout(true);
- EXPECT_EQ(2 * kDefaultTCPMSS, sender_->GetCongestionWindow());
- EXPECT_EQ(5u, sender_->slowstart_threshold());
-
- sender_->OnRetransmissionTimeout(true);
- EXPECT_EQ(2 * kDefaultTCPMSS, sender_->GetCongestionWindow());
- EXPECT_EQ(5u, sender_->slowstart_threshold());
-
- AckNPackets(2);
-
- EXPECT_EQ(4 * kDefaultTCPMSS, sender_->GetCongestionWindow());
- EXPECT_EQ(5u, sender_->slowstart_threshold());
-
- sender_->OnRetransmissionTimeout(true);
- EXPECT_EQ(2 * kDefaultTCPMSS, sender_->GetCongestionWindow());
- EXPECT_EQ(2u, sender_->slowstart_threshold());
-}
-
TEST_F(TcpCubicSenderTest, RetransmissionDelay) {
const int64 kRttMs = 10;
const int64 kDeviationMs = 3;
« no previous file with comments | « net/quic/congestion_control/tcp_cubic_sender.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698