Revert "Flip FLAGS_quic_reloadable_flag_quic_close_all_encryptions_levels"
This reverts commit fe4a28df91574876c401101d27a5a6f4d9e24ebc.
Reason for revert:
Findit (https://goo.gl/kROfz5) identified CL at revision 716491 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2ZlNGEyOGRmOTE1NzQ4NzZjNDAxMTAxZDI3YTVhNmY0ZDllMjRlYmMM
Sample Failed Build: https://ci.chromium.org/b/8896391819190311952
Sample Failed Step: net_unittests
Original change's description:
> Flip FLAGS_quic_reloadable_flag_quic_close_all_encryptions_levels
>
> Fix a bug in the test packet maker where the retry token fields
> were carried over from one packet to another.
>
> Change-Id: I1677f15eec976ecc0ba8afbd524a57916d0c3aa9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1922550
> Commit-Queue: Zhongyi Shi <[email protected]>
> Reviewed-by: Zhongyi Shi <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#716491}
Change-Id: Ie149714725e8f8fb410a2adae01729d453e746b5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1922736
Cr-Commit-Position: refs/heads/master@{#716506}
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index f2bcee5..a4e01513 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -3141,6 +3141,10 @@
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeRetransmissionPacket(
2, packet_num++, true));
+ quic_data.AddWrite(SYNCHRONOUS,
+ client_maker_.MakeConnectionClosePacket(
+ packet_num++, true, quic::QUIC_NETWORK_IDLE_TIMEOUT,
+ "No recent network activity."));
} else {
// Settings were sent in the request packet so there is only 1 packet to
// retransmit.
@@ -3159,10 +3163,7 @@
// RTO 3
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeRetransmissionPacket(
1, packet_num++, true));
- }
- for (auto level :
- {quic::ENCRYPTION_ZERO_RTT, quic::ENCRYPTION_FORWARD_SECURE}) {
- client_maker_.SetEncryptionLevel(level);
+
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeConnectionClosePacket(
packet_num++, true, quic::QUIC_NETWORK_IDLE_TIMEOUT,
@@ -3263,16 +3264,10 @@
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeRetransmissionPacket(2, 12, true));
// RTO 5
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeConnectionClosePacket(
13, true, quic::QUIC_TOO_MANY_RTOS,
"5 consecutive retransmission timeouts"));
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- quic_data.AddWrite(SYNCHRONOUS,
- client_maker_.MakeConnectionClosePacket(
- 14, true, quic::QUIC_TOO_MANY_RTOS,
- "5 consecutive retransmission timeouts"));
} else {
// TLP 1
quic_data.AddWrite(SYNCHRONOUS,
@@ -3293,16 +3288,10 @@
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeRetransmissionPacket(1, 7, true));
// RTO 5
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeConnectionClosePacket(
8, true, quic::QUIC_TOO_MANY_RTOS,
"5 consecutive retransmission timeouts"));
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- quic_data.AddWrite(SYNCHRONOUS,
- client_maker_.MakeConnectionClosePacket(
- 9, true, quic::QUIC_TOO_MANY_RTOS,
- "5 consecutive retransmission timeouts"));
}
quic_data.AddRead(ASYNC, OK);
@@ -3404,16 +3393,10 @@
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeRetransmissionPacket(2, 12, true));
// RTO 5
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeConnectionClosePacket(
13, true, quic::QUIC_TOO_MANY_RTOS,
"5 consecutive retransmission timeouts"));
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- quic_data.AddWrite(SYNCHRONOUS,
- client_maker_.MakeConnectionClosePacket(
- 14, true, quic::QUIC_TOO_MANY_RTOS,
- "5 consecutive retransmission timeouts"));
} else if (FLAGS_quic_allow_http3_priority) {
quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeRstPacket(
@@ -3448,16 +3431,10 @@
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeRetransmissionPacket(1, 13, true));
// RTO 5
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeConnectionClosePacket(
14, true, quic::QUIC_TOO_MANY_RTOS,
"5 consecutive retransmission timeouts"));
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- quic_data.AddWrite(SYNCHRONOUS,
- client_maker_.MakeConnectionClosePacket(
- 15, true, quic::QUIC_TOO_MANY_RTOS,
- "5 consecutive retransmission timeouts"));
} else {
quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeRstPacket(
@@ -3494,16 +3471,10 @@
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeRetransmissionPacket(3, 13, true));
// RTO 5
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_ZERO_RTT);
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeConnectionClosePacket(
14, true, quic::QUIC_TOO_MANY_RTOS,
"5 consecutive retransmission timeouts"));
- client_maker_.SetEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE);
- quic_data.AddWrite(SYNCHRONOUS,
- client_maker_.MakeConnectionClosePacket(
- 15, true, quic::QUIC_TOO_MANY_RTOS,
- "5 consecutive retransmission timeouts"));
}
quic_data.AddRead(ASYNC, OK);
@@ -3576,15 +3547,11 @@
1, false, GetNthClientInitiatedBidirectionalStreamId(47),
quic::QUIC_STREAM_LAST_ERROR));
std::string quic_error_details = "Data for nonexistent stream";
- for (auto level :
- {quic::ENCRYPTION_ZERO_RTT, quic::ENCRYPTION_FORWARD_SECURE}) {
- client_maker_.SetEncryptionLevel(level);
- quic_data.AddWrite(SYNCHRONOUS,
- ConstructClientAckAndConnectionClosePacket(
- packet_num++, quic::QuicTime::Delta::Zero(), 1, 1, 1,
- quic::QUIC_INVALID_STREAM_ID, quic_error_details,
- quic::IETF_RST_STREAM));
- }
+ quic_data.AddWrite(SYNCHRONOUS,
+ ConstructClientAckAndConnectionClosePacket(
+ packet_num++, quic::QuicTime::Delta::Zero(), 1, 1, 1,
+ quic::QUIC_INVALID_STREAM_ID, quic_error_details,
+ quic::IETF_RST_STREAM));
quic_data.AddSocketDataToFactory(&socket_factory_);
// In order for a new QUIC session to be established via alternate-protocol
@@ -3672,6 +3639,11 @@
1, packet_num++, true));
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeRetransmissionPacket(
2, packet_num++, true));
+
+ quic_data.AddWrite(SYNCHRONOUS,
+ client_maker_.MakeConnectionClosePacket(
+ packet_num++, true, quic::QUIC_NETWORK_IDLE_TIMEOUT,
+ "No recent network activity."));
} else {
// TLP 1
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeRetransmissionPacket(
@@ -3688,11 +3660,7 @@
// RTO 3
quic_data.AddWrite(SYNCHRONOUS, client_maker_.MakeRetransmissionPacket(
1, packet_num++, true));
- }
- for (auto level :
- {quic::ENCRYPTION_ZERO_RTT, quic::ENCRYPTION_FORWARD_SECURE}) {
- client_maker_.SetEncryptionLevel(level);
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakeConnectionClosePacket(
packet_num++, true, quic::QUIC_NETWORK_IDLE_TIMEOUT,
@@ -3797,15 +3765,11 @@
1, false, GetNthClientInitiatedBidirectionalStreamId(47),
quic::QUIC_STREAM_LAST_ERROR));
std::string quic_error_details = "Data for nonexistent stream";
- for (auto level :
- {quic::ENCRYPTION_ZERO_RTT, quic::ENCRYPTION_FORWARD_SECURE}) {
- client_maker_.SetEncryptionLevel(level);
- quic_data.AddWrite(SYNCHRONOUS,
- ConstructClientAckAndConnectionClosePacket(
- packet_num++, quic::QuicTime::Delta::Zero(), 1, 1, 1,
- quic::QUIC_INVALID_STREAM_ID, quic_error_details,
- quic::IETF_RST_STREAM));
- }
+ quic_data.AddWrite(SYNCHRONOUS,
+ ConstructClientAckAndConnectionClosePacket(
+ packet_num++, quic::QuicTime::Delta::Zero(), 1, 1, 1,
+ quic::QUIC_INVALID_STREAM_ID, quic_error_details,
+ quic::IETF_RST_STREAM));
quic_data.AddSocketDataToFactory(&socket_factory_);
// After that fails, it will be resent via TCP.
@@ -3912,15 +3876,11 @@
1, false, GetNthClientInitiatedBidirectionalStreamId(47),
quic::QUIC_STREAM_LAST_ERROR));
std::string quic_error_details = "Data for nonexistent stream";
- for (auto level :
- {quic::ENCRYPTION_ZERO_RTT, quic::ENCRYPTION_FORWARD_SECURE}) {
- client_maker_.SetEncryptionLevel(level);
- quic_data.AddWrite(SYNCHRONOUS,
- ConstructClientAckAndConnectionClosePacket(
- packet_number++, quic::QuicTime::Delta::Zero(), 1, 1,
- 1, quic::QUIC_INVALID_STREAM_ID, quic_error_details,
- quic::IETF_RST_STREAM));
- }
+ quic_data.AddWrite(
+ SYNCHRONOUS, ConstructClientAckAndConnectionClosePacket(
+ packet_number++, quic::QuicTime::Delta::Zero(), 1, 1, 1,
+ quic::QUIC_INVALID_STREAM_ID, quic_error_details,
+ quic::IETF_RST_STREAM));
quic_data.AddSocketDataToFactory(&socket_factory_);
// After that fails, it will be resent via TCP.
@@ -5614,15 +5574,11 @@
1, false, GetNthClientInitiatedBidirectionalStreamId(47),
quic::QUIC_STREAM_LAST_ERROR));
std::string quic_error_details = "Data for nonexistent stream";
- for (auto level :
- {quic::ENCRYPTION_ZERO_RTT, quic::ENCRYPTION_FORWARD_SECURE}) {
- client_maker_.SetEncryptionLevel(level);
- mock_quic_data.AddWrite(
- SYNCHRONOUS, ConstructClientAckAndConnectionClosePacket(
- packet_num++, quic::QuicTime::Delta::Zero(), 1, 1, 1,
- quic::QUIC_INVALID_STREAM_ID, quic_error_details,
- quic::IETF_RST_STREAM));
- }
+ mock_quic_data.AddWrite(
+ SYNCHRONOUS, ConstructClientAckAndConnectionClosePacket(
+ packet_num++, quic::QuicTime::Delta::Zero(), 1, 1, 1,
+ quic::QUIC_INVALID_STREAM_ID, quic_error_details,
+ quic::IETF_RST_STREAM));
mock_quic_data.AddSocketDataToFactory(&socket_factory_);
// The non-alternate protocol job needs to hang in order to guarantee that
