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

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

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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/congestion_control/tcp_cubic_sender.cc ('k') | net/quic/congestion_control/tcp_loss_algorithm.h » ('j') | 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 e4737eb16854fc1eb1ad0ed47abdcd3a3ef347bd..ebea8aeccaa40dbf961b20160e4b46d4568d4a0c 100644
--- a/net/quic/congestion_control/tcp_cubic_sender_test.cc
+++ b/net/quic/congestion_control/tcp_cubic_sender_test.cc
@@ -718,14 +718,26 @@ TEST_F(TcpCubicSenderTest, BandwidthResumption) {
// Ensure that an old estimate is not used for bandwidth resumption.
cached_network_params.set_timestamp(clock_.WallNow().ToUNIXSeconds() -
(kNumSecondsPerHour + 1));
- sender_->ResumeConnectionState(cached_network_params);
+ EXPECT_FALSE(sender_->ResumeConnectionState(cached_network_params));
EXPECT_EQ(10u, sender_->congestion_window());
// If the estimate is new enough, make sure it is used.
cached_network_params.set_timestamp(clock_.WallNow().ToUNIXSeconds() -
(kNumSecondsPerHour - 1));
- sender_->ResumeConnectionState(cached_network_params);
+ EXPECT_TRUE(sender_->ResumeConnectionState(cached_network_params));
EXPECT_EQ(kNumberOfPackets, sender_->congestion_window());
+
+ // Resumed CWND is limited to be in a sensible range.
+ cached_network_params.set_bandwidth_estimate_bytes_per_second(
+ (kMaxTcpCongestionWindow + 1) * kMaxPacketSize);
+ EXPECT_TRUE(sender_->ResumeConnectionState(cached_network_params));
+ EXPECT_EQ(kMaxTcpCongestionWindow, sender_->congestion_window());
+
+ cached_network_params.set_bandwidth_estimate_bytes_per_second(
+ (kMinCongestionWindowForBandwidthResumption - 1) * kMaxPacketSize);
+ EXPECT_TRUE(sender_->ResumeConnectionState(cached_network_params));
+ EXPECT_EQ(kMinCongestionWindowForBandwidthResumption,
+ sender_->congestion_window());
}
} // namespace test
« no previous file with comments | « net/quic/congestion_control/tcp_cubic_sender.cc ('k') | net/quic/congestion_control/tcp_loss_algorithm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698