Index: net/quic/core/congestion_control/bbr_sender_test.cc |
diff --git a/net/quic/core/congestion_control/bbr_sender_test.cc b/net/quic/core/congestion_control/bbr_sender_test.cc |
index 96c56eefa952413f7e37b1cd1d2f6308dae6d911..de61b8c50ebb5ca7df1ac4bf5ec1a70030728774 100644 |
--- a/net/quic/core/congestion_control/bbr_sender_test.cc |
+++ b/net/quic/core/congestion_control/bbr_sender_test.cc |
@@ -419,6 +419,38 @@ TEST_F(BbrSenderTest, SimpleTransferAckDecimationKeepSending) { |
ExpectApproxEq(kTestRtt, rtt_stats_->min_rtt(), 0.1f); |
} |
+// Test a simple long data transfer with 2 rtts of aggregation. |
+TEST_F(BbrSenderTest, |
+ SimpleTransfer2RTTAggregationBytesWithIncreasedInflightLimit) { |
+ FLAGS_quic_reloadable_flag_quic_bbr_ack_aggregation_bytes = false; |
+ FLAGS_quic_reloadable_flag_quic_bbr_add_tso_cwnd = false; |
+ FLAGS_quic_reloadable_flag_quic_bbr_keep_sending_at_recent_rate = false; |
+ FLAGS_quic_reloadable_flag_quic_bbr_slow_recent_delivery = true; |
+ SetQuicFlag(&FLAGS_quic_bbr_slow_delivery_threshold_multiplier, 0.5); |
+ SetQuicFlag(&FLAGS_quic_bbr_slow_delivery_cwnd_gain, 4.0); |
+ CreateDefaultSetup(); |
+ // 2 RTTs of aggregation, with a max of 10kb. |
+ EnableAggregation(10 * 1024, 2 * kTestRtt); |
+ |
+ // Transfer 12MB. |
+ DoSimpleTransfer(12 * 1024 * 1024, QuicTime::Delta::FromSeconds(35)); |
+ EXPECT_EQ(BbrSender::PROBE_BW, sender_->ExportDebugState().mode); |
+ // It's possible to read a bandwidth as much as 50% too high with aggregation. |
+ EXPECT_LE(kTestLinkBandwidth * 0.99f, |
+ sender_->ExportDebugState().max_bandwidth); |
+ // TODO(ianswett): Tighten this bound once we understand why BBR is |
+ // overestimating bandwidth with aggregation. b/36022633 |
+ EXPECT_GE(kTestLinkBandwidth * 1.5f, |
+ sender_->ExportDebugState().max_bandwidth); |
+ // TODO(ianswett): Expect 0 packets are lost once BBR no longer measures |
+ // bandwidth higher than the link rate. |
+ EXPECT_FALSE(sender_->ExportDebugState().last_sample_is_app_limited); |
+ // The margin here is high, because the aggregation greatly increases |
+ // smoothed rtt. |
+ EXPECT_GE(kTestRtt * 4, rtt_stats_->smoothed_rtt()); |
+ ExpectApproxEq(kTestRtt, rtt_stats_->min_rtt(), 0.1f); |
+} |
+ |
// Test the number of losses incurred by the startup phase in a situation when |
// the buffer is less than BDP. |
TEST_F(BbrSenderTest, PacketLossOnSmallBufferStartup) { |