Fix some test expectation regarding SendControlFrame().
Before IETF QUIC, only 1 control frame will be sent for a stream reset. But IETF requires both a RST and STOP_SENDING. The tests that explicitly expect SendControlFrame() to be called once is making the wrong assumption.
The reason they still pass is the first write was buffered so the second write won't trigger.
Remove the explicit Times(1) to avoid confusion.
gfe-relnote: n/a. test only.
PiperOrigin-RevId: 276736424
Change-Id: Iffa8de79c51e28355ef4aa8381ae049948e40b67
diff --git a/quic/core/http/quic_spdy_client_session_test.cc b/quic/core/http/quic_spdy_client_session_test.cc
index 59634f8..22e0f52 100644
--- a/quic/core/http/quic_spdy_client_session_test.cc
+++ b/quic/core/http/quic_spdy_client_session_test.cc
@@ -32,6 +32,7 @@
using spdy::SpdyHeaderBlock;
using testing::_;
using testing::AnyNumber;
+using testing::AtLeast;
using testing::AtMost;
using testing::Invoke;
using testing::Truly;
@@ -244,8 +245,6 @@
// TODO(nharper): Add support for Transport Parameters in the TLS handshake.
return;
}
- EXPECT_CALL(*connection_, SendControlFrame(_)).Times(AnyNumber());
- EXPECT_CALL(*connection_, OnStreamReset(_, _)).Times(AnyNumber());
uint32_t kServerMaxIncomingStreams = 1;
CompleteCryptoHandshake(kServerMaxIncomingStreams);
@@ -276,8 +275,6 @@
// TODO(nharper): Add support for Transport Parameters in the TLS handshake.
return;
}
- EXPECT_CALL(*connection_, SendControlFrame(_)).Times(AnyNumber());
- EXPECT_CALL(*connection_, OnStreamReset(_, _)).Times(AnyNumber());
uint32_t kServerMaxIncomingStreams = 1;
CompleteCryptoHandshake(kServerMaxIncomingStreams);
@@ -345,7 +342,9 @@
QuicStreamId stream_id = stream->id();
- EXPECT_CALL(*connection_, SendControlFrame(_)).Times(1);
+ EXPECT_CALL(*connection_, SendControlFrame(_))
+ .Times(AtLeast(1))
+ .WillRepeatedly(Invoke(&ClearControlFrame));
EXPECT_CALL(*connection_, OnStreamReset(_, _)).Times(1);
session_->SendRstStream(stream_id, QUIC_STREAM_PEER_GOING_AWAY, 0);
@@ -395,7 +394,9 @@
// Send the RST, which results in the stream being closed locally (but some
// state remains while the client waits for a response from the server).
QuicStreamId stream_id = stream->id();
- EXPECT_CALL(*connection_, SendControlFrame(_)).Times(1);
+ EXPECT_CALL(*connection_, SendControlFrame(_))
+ .Times(AtLeast(1))
+ .WillRepeatedly(Invoke(&ClearControlFrame));
EXPECT_CALL(*connection_, OnStreamReset(_, _)).Times(1);
session_->SendRstStream(stream_id, QUIC_STREAM_PEER_GOING_AWAY, 0);
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index f95b994..80b651e 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -1242,13 +1242,8 @@
EXPECT_FALSE(headers_stream->flow_controller()->IsBlocked());
EXPECT_FALSE(session_.IsConnectionFlowControlBlocked());
EXPECT_FALSE(session_.IsStreamFlowControlBlocked());
- if (VersionHasIetfQuicFrames(transport_version())) {
- EXPECT_CALL(*connection_, SendControlFrame(_))
- .WillOnce(Invoke(&ClearControlFrame));
- } else {
- EXPECT_CALL(*connection_, SendControlFrame(_))
- .WillOnce(Invoke(&ClearControlFrame));
- }
+ EXPECT_CALL(*connection_, SendControlFrame(_))
+ .WillOnce(Invoke(&ClearControlFrame));
for (QuicStreamId i = 0;
!crypto_stream->flow_controller()->IsBlocked() && i < 1000u; i++) {
EXPECT_FALSE(session_.IsConnectionFlowControlBlocked());
diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc
index 7aa69e8..d209454 100644
--- a/quic/core/quic_stream_test.cc
+++ b/quic/core/quic_stream_test.cc
@@ -910,7 +910,9 @@
EXPECT_TRUE(session_->HasUnackedStreamData());
EXPECT_CALL(*connection_,
OnStreamReset(stream_->id(), QUIC_STREAM_CANCELLED));
- EXPECT_CALL(*connection_, SendControlFrame(_)).Times(1);
+ EXPECT_CALL(*connection_, SendControlFrame(_))
+ .Times(AtLeast(1))
+ .WillRepeatedly(Invoke(&ClearControlFrame));
EXPECT_CALL(*session_, SendRstStream(stream_->id(), QUIC_STREAM_CANCELLED, 9))
.WillOnce(InvokeWithoutArgs([this]() {
return QuicSessionPeer::SendRstStreamInner(
