Commit 75e72298 authored by Bence Béky's avatar Bence Béky Committed by Commit Bot

Re-enable IETF QUIC versions for HttpStreamFactoryBidirectionalQuicTest.

Bug: 1059073
Change-Id: I0ab1d5a5d311c7e5187acf16021e5a86e3325a11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090506
Commit-Queue: David Schinazi <dschinazi@chromium.org>
Auto-Submit: Bence Béky <bnc@chromium.org>
Reviewed-by: default avatarDavid Schinazi <dschinazi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748088}
parent ec7774d8
...@@ -2227,6 +2227,7 @@ class HttpStreamFactoryBidirectionalQuicTest ...@@ -2227,6 +2227,7 @@ class HttpStreamFactoryBidirectionalQuicTest
proxy_resolution_service_( proxy_resolution_service_(
ConfiguredProxyResolutionService::CreateDirect()), ConfiguredProxyResolutionService::CreateDirect()),
ssl_config_service_(new SSLConfigServiceDefaults) { ssl_config_service_(new SSLConfigServiceDefaults) {
FLAGS_quic_enable_http3_grease_randomness = false;
quic_context_.AdvanceTime(quic::QuicTime::Delta::FromMilliseconds(20)); quic_context_.AdvanceTime(quic::QuicTime::Delta::FromMilliseconds(20));
if (version_.handshake_protocol == quic::PROTOCOL_TLS1_3) { if (version_.handshake_protocol == quic::PROTOCOL_TLS1_3) {
quic::QuicEnableVersion(version_); quic::QuicEnableVersion(version_);
...@@ -2328,28 +2329,25 @@ class HttpStreamFactoryBidirectionalQuicTest ...@@ -2328,28 +2329,25 @@ class HttpStreamFactoryBidirectionalQuicTest
HttpNetworkSession::Params params_; HttpNetworkSession::Params params_;
}; };
quic::ParsedQuicVersionVector TestVersions() { INSTANTIATE_TEST_SUITE_P(
quic::ParsedQuicVersionVector versions; VersionIncludeStreamDependencySequence,
for (const quic::ParsedQuicVersion& version : quic::AllSupportedVersions()) { HttpStreamFactoryBidirectionalQuicTest,
if (version.HasIetfQuicFrames()) { ::testing::Combine(::testing::ValuesIn(quic::AllSupportedVersions()),
// TODO(crbug.com/1059073) test all versions. ::testing::Bool()));
continue;
}
versions.push_back(version);
}
return versions;
}
INSTANTIATE_TEST_SUITE_P(VersionIncludeStreamDependencySequence,
HttpStreamFactoryBidirectionalQuicTest,
::testing::Combine(::testing::ValuesIn(TestVersions()),
::testing::Bool()));
TEST_P(HttpStreamFactoryBidirectionalQuicTest, TEST_P(HttpStreamFactoryBidirectionalQuicTest,
RequestBidirectionalStreamImplQuicAlternative) { RequestBidirectionalStreamImplQuicAlternative) {
MockQuicData mock_quic_data(version()); MockQuicData mock_quic_data(version());
// When using IETF QUIC, set priority to default value so that
// QuicTestPacketMaker::MakeRequestHeadersPacket() does not add mock
// PRIORITY_UPDATE frame, which BidirectionalStreamQuicImpl currently does not
// send.
// TODO(https://crbug.com/1059250): Implement PRIORITY_UPDATE in
// BidirectionalStreamQuicImpl.
spdy::SpdyPriority priority = spdy::SpdyPriority priority =
ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); version().UsesHttp3()
? 1
: ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY);
size_t spdy_headers_frame_length; size_t spdy_headers_frame_length;
int packet_num = 1; int packet_num = 1;
if (VersionUsesHttp3(version().transport_version)) { if (VersionUsesHttp3(version().transport_version)) {
...@@ -2477,8 +2475,16 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest, ...@@ -2477,8 +2475,16 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
RequestBidirectionalStreamImplHttpJobFailsQuicJobSucceeds) { RequestBidirectionalStreamImplHttpJobFailsQuicJobSucceeds) {
// Set up Quic data. // Set up Quic data.
MockQuicData mock_quic_data(version()); MockQuicData mock_quic_data(version());
// When using IETF QUIC, set priority to default value so that
// QuicTestPacketMaker::MakeRequestHeadersPacket() does not add mock
// PRIORITY_UPDATE frame, which BidirectionalStreamQuicImpl currently does not
// send.
// TODO(https://crbug.com/1059250): Implement PRIORITY_UPDATE in
// BidirectionalStreamQuicImpl.
spdy::SpdyPriority priority = spdy::SpdyPriority priority =
ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); version().UsesHttp3()
? 1
: ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY);
size_t spdy_headers_frame_length; size_t spdy_headers_frame_length;
int packet_num = 1; int packet_num = 1;
if (VersionUsesHttp3(version().transport_version)) { if (VersionUsesHttp3(version().transport_version)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment