Remove tests for the deprecated kB201 connection option from BBR2 and BBR3 simulator tests. PiperOrigin-RevId: 908754036
diff --git a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc index d648695..0efed58 100644 --- a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc +++ b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -531,25 +531,6 @@ EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); } -TEST_F(Bbr2DefaultTopologyTest, SimpleTransferB201) { - SetConnectionOption(kB201); - DefaultTopologyParams params; - CreateNetwork(params); - - // Transfer 12MB. - DoSimpleTransfer(12 * 1024 * 1024, QuicTime::Delta::FromSeconds(35)); - EXPECT_TRUE(Bbr2ModeIsOneOf({Bbr2Mode::PROBE_BW, Bbr2Mode::PROBE_RTT})); - - EXPECT_APPROX_EQ(params.BottleneckBandwidth(), - sender_->ExportDebugState().bandwidth_hi, 0.01f); - - EXPECT_LE(sender_loss_rate_in_packets(), 0.05); - // The margin here is high, because the aggregation greatly increases - // smoothed rtt. - EXPECT_GE(params.RTT() * 4, rtt_stats()->smoothed_rtt()); - EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); -} - TEST_F(Bbr2DefaultTopologyTest, SimpleTransferB206) { SetConnectionOption(kB206); DefaultTopologyParams params; @@ -714,28 +695,6 @@ EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); } -TEST_F(Bbr2DefaultTopologyTest, SimpleTransfer2RTTAggregationBytesB201) { - SetConnectionOption(kB201); - DefaultTopologyParams params; - CreateNetwork(params); - // 2 RTTs of aggregation, with a max of 10kb. - EnableAggregation(10 * 1024, 2 * params.RTT()); - - // Transfer 12MB. - DoSimpleTransfer(12 * 1024 * 1024, QuicTime::Delta::FromSeconds(35)); - EXPECT_TRUE(Bbr2ModeIsOneOf({Bbr2Mode::PROBE_BW, Bbr2Mode::PROBE_RTT})); - - // TODO(wub): Tighten the error bound once BSAO is default enabled. - EXPECT_APPROX_EQ(params.BottleneckBandwidth(), - sender_->ExportDebugState().bandwidth_hi, 0.5f); - - EXPECT_LE(sender_loss_rate_in_packets(), 0.01); - // The margin here is high, because both link level aggregation and ack - // decimation can greatly increase smoothed rtt. - EXPECT_GE(params.RTT() * 5, rtt_stats()->smoothed_rtt()); - EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); -} - TEST_F(Bbr2DefaultTopologyTest, SimpleTransferAckDecimation) { SetConnectionOption(kBSAO); DefaultTopologyParams params;
diff --git a/quiche/quic/core/congestion_control/bbr3_simulator_test.cc b/quiche/quic/core/congestion_control/bbr3_simulator_test.cc index c8b625f..d220de5 100644 --- a/quiche/quic/core/congestion_control/bbr3_simulator_test.cc +++ b/quiche/quic/core/congestion_control/bbr3_simulator_test.cc
@@ -439,25 +439,6 @@ EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); } -TEST_F(Bbr3DefaultTopologyTest, SimpleTransferB201) { - SetConnectionOption(kB201); - DefaultTopologyParams params; - CreateNetwork(params); - - // Transfer 12MB. - DoSimpleTransfer(12 * 1024 * 1024, QuicTime::Delta::FromSeconds(35)); - EXPECT_TRUE(Bbr3ModeIsOneOf({Bbr2Mode::PROBE_BW, Bbr2Mode::PROBE_RTT})); - - EXPECT_APPROX_EQ(params.BottleneckBandwidth(), - sender_->ExportDebugState().bandwidth_hi, 0.01f); - - EXPECT_LE(sender_loss_rate_in_packets(), 0.05); - // The margin here is high, because the aggregation greatly increases - // smoothed rtt. - EXPECT_GE(params.RTT() * 4, rtt_stats()->smoothed_rtt()); - EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); -} - TEST_F(Bbr3DefaultTopologyTest, SimpleTransferB206) { SetConnectionOption(kB206); DefaultTopologyParams params; @@ -603,28 +584,6 @@ EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); } -TEST_F(Bbr3DefaultTopologyTest, SimpleTransfer2RTTAggregationBytesB201) { - SetConnectionOption(kB201); - DefaultTopologyParams params; - CreateNetwork(params); - // 2 RTTs of aggregation, with a max of 10kb. - EnableAggregation(10 * 1024, 2 * params.RTT()); - - // Transfer 12MB. - DoSimpleTransfer(12 * 1024 * 1024, QuicTime::Delta::FromSeconds(35)); - EXPECT_TRUE(Bbr3ModeIsOneOf({Bbr2Mode::PROBE_BW, Bbr2Mode::PROBE_RTT})); - - // TODO(wub): Tighten the error bound once BSAO is default enabled. - EXPECT_APPROX_EQ(params.BottleneckBandwidth(), - sender_->ExportDebugState().bandwidth_hi, 0.5f); - - EXPECT_LE(sender_loss_rate_in_packets(), 0.01); - // The margin here is high, because both link level aggregation and ack - // decimation can greatly increase smoothed rtt. - EXPECT_GE(params.RTT() * 5, rtt_stats()->smoothed_rtt()); - EXPECT_APPROX_EQ(params.RTT(), rtt_stats()->min_rtt(), 0.2f); -} - TEST_F(Bbr3DefaultTopologyTest, SimpleTransferAckDecimation) { SetConnectionOption(kBSAO); DefaultTopologyParams params;