chromium/src
0
Fork 0
Code Activity

Fix QuicSpdyStreamTest.

Browse Source 
Review-Url: https://codereview.chromium.org/2731203002
Cr-Commit-Position: refs/heads/master@{#454925}
This commit is contained in:
rch
2017-03-06 11:51:05 -08:00
committed by Commit bot
parent c99c2556e9
commit e8cf2b3e52
2 changed files with 7 additions and 3 deletions

2
net/quic/core/quic_flags_list.h

@ -106,7 +106,7 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_remove_v33_hacks2, false)
// If true, limits QUIC uncompressed headers to 16K.
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_limit_uncompressed_headers,
false)
true)
// Enable QUIC force HOL blocking experiment.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_force_hol_blocking, true)

8
net/quic/core/quic_spdy_stream_test.cc

@ -17,8 +17,8 @@
#include "net/quic/test_tools/quic_session_peer.h"
#include "net/quic/test_tools/quic_stream_peer.h"
#include "net/quic/test_tools/quic_test_utils.h"
#include "net/test/gtest_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::StringPiece;
using std::string;
@ -752,9 +752,11 @@ TEST_P(QuicSpdyStreamTest, ReceivingTrailersWithoutFin) {
auto headers = AsHeaderList(headers_);
stream_->OnStreamHeaderList(/*fin=*/false,
headers.uncompressed_header_bytes(), headers);
stream_->ConsumeHeaderList();
// Receive trailing headers with FIN deliberately set to false.
SpdyHeaderBlock trailers_block;
trailers_block["foo"] = "bar";
auto trailers = AsHeaderList(trailers_block);
EXPECT_CALL(*connection_,
@ -774,6 +776,7 @@ TEST_P(QuicSpdyStreamTest, ReceivingTrailersAfterHeadersWithFin) {
// Receive trailing headers after FIN already received.
SpdyHeaderBlock trailers_block;
trailers_block["foo"] = "bar";
EXPECT_CALL(*connection_,
CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA, _, _))
.Times(1);
@ -794,10 +797,11 @@ TEST_P(QuicSpdyStreamTest, ReceivingTrailersAfterBodyWithFin) {
// Receive trailing headers after FIN already received.
SpdyHeaderBlock trailers_block;
trailers_block["foo"] = "bar";
EXPECT_CALL(*connection_,
CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA, _, _))
.Times(1);
ProcessHeaders(false, trailers_block);
ProcessHeaders(true, trailers_block);
}
TEST_P(QuicSpdyStreamTest, ClosingStreamWithNoTrailers) {