Commit 2cbd8c62 authored by David Schinazi's avatar David Schinazi Committed by Commit Bot

Reenable disable_draft_25

This flag was verified last week, and was then set
`chrome_value: false` because it was breaking tests.
After digging further, I realized that the failing
test was incorrect: it would create a dispatcher with
no versions, which triggers a DCHECK. This used to pass
because draft-25 was a version that could support
WebTransport but wasn't part of the origin trial
versions. I don't think this test adds much value,
because if there are no versions on the server we don't
really care about validating that everything fails. So
this CL removes that test, and flips the flag back.

Change-Id: I80bc8bd3ee76238311d3ac21b034b5a526e6202a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297964
Auto-Submit: David Schinazi <dschinazi@chromium.org>
Reviewed-by: default avatarNick Harper <nharper@chromium.org>
Commit-Queue: David Schinazi <dschinazi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788851}
parent 09b475c6
...@@ -242,7 +242,7 @@ QUIC_FLAG(bool, ...@@ -242,7 +242,7 @@ QUIC_FLAG(bool,
QUIC_FLAG(bool, FLAGS_quic_enable_http3_grease_randomness, true) QUIC_FLAG(bool, FLAGS_quic_enable_http3_grease_randomness, true)
// If true, disable QUIC version h3-25. // If true, disable QUIC version h3-25.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_draft_25, false) QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_draft_25, true)
// If true, disable QUIC version h3-27. // If true, disable QUIC version h3-27.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_draft_27, false) QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_disable_version_draft_27, false)
......
...@@ -148,7 +148,7 @@ class QuicTransportEndToEndTest : public TestWithTaskEnvironment { ...@@ -148,7 +148,7 @@ class QuicTransportEndToEndTest : public TestWithTaskEnvironment {
std::unique_ptr<URLRequestContext> context_; std::unique_ptr<URLRequestContext> context_;
std::unique_ptr<QuicTransportClient> client_; std::unique_ptr<QuicTransportClient> client_;
TestConnectionHelper* helper_; // Owned by |context_|. TestConnectionHelper* helper_; // Owned by |context_|.
MockVisitor visitor_; ::testing::NiceMock<MockVisitor> visitor_;
std::unique_ptr<QuicTransportSimpleServer> server_; std::unique_ptr<QuicTransportSimpleServer> server_;
std::unique_ptr<base::RunLoop> run_loop_; std::unique_ptr<base::RunLoop> run_loop_;
...@@ -282,23 +282,6 @@ TEST_F(QuicTransportEndToEndTest, OldVersion) { ...@@ -282,23 +282,6 @@ TEST_F(QuicTransportEndToEndTest, OldVersion) {
EXPECT_TRUE(client_->session()->IsSessionReady()); EXPECT_TRUE(client_->session()->IsSessionReady());
} }
TEST_F(QuicTransportEndToEndTest, NoCommonVersion) {
// Disable all WebTransport versions.
for (const quic::ParsedQuicVersion& version :
QuicTransportClient::QuicVersionsForWebTransportOriginTrial()) {
quic::QuicDisableVersion(version);
}
StartServer();
client_ = std::make_unique<QuicTransportClient>(
GetURL("/discard"), origin_, &visitor_, isolation_key_, context_.get(),
QuicTransportClient::Parameters());
client_->Connect();
EXPECT_CALL(visitor_, OnConnectionFailed()).WillOnce(StopRunning());
Run();
EXPECT_TRUE(client_->session() == nullptr);
EXPECT_EQ(client_->error().quic_error, quic::QUIC_INVALID_VERSION);
}
} // namespace } // namespace
} // namespace test } // namespace test
} // namespace net } // namespace net
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