diff --git a/test/common/http/BUILD b/test/common/http/BUILD index ee91fd614c683..a05e67c95ce5c 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -418,8 +418,6 @@ envoy_cc_test( ], ) -# TODO(alyssawilk): The conn pool grid should work correctly without H3. Circle back and figure -# out the right way of handling the lack of H3 in the build. envoy_cc_test( name = "conn_pool_grid_test", srcs = envoy_select_enable_http3(["conn_pool_grid_test.cc"]), diff --git a/test/integration/multiplexed_upstream_integration_test.cc b/test/integration/multiplexed_upstream_integration_test.cc index 3cddb177b3a09..2c2eb1717cf4b 100644 --- a/test/integration/multiplexed_upstream_integration_test.cc +++ b/test/integration/multiplexed_upstream_integration_test.cc @@ -333,11 +333,6 @@ TEST_P(Http2UpstreamIntegrationTest, ManyLargeSimultaneousRequestWithBufferLimit } TEST_P(Http2UpstreamIntegrationTest, ManyLargeSimultaneousRequestWithRandomBackup) { - if (upstreamProtocol() == FakeHttpConnection::Type::HTTP3) { - // TODO(alyssawilk) debug and enable. - return; - } - config_helper_.addFilter( fmt::format(R"EOF( name: pause-filter{} diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc index 88f736b57e4a4..7b5d3c85b4819 100644 --- a/test/integration/protocol_integration_test.cc +++ b/test/integration/protocol_integration_test.cc @@ -526,15 +526,9 @@ TEST_P(ProtocolIntegrationTest, Retry) { EXPECT_EQ("200", response->headers().getStatusValue()); EXPECT_EQ(512U, response->body().size()); Stats::Store& stats = test_server_->server().stats(); - if (upstreamProtocol() == FakeHttpConnection::Type::HTTP2) { - Stats::CounterSharedPtr counter = - TestUtility::findCounter(stats, "cluster.cluster_0.http2.tx_reset"); - ASSERT_NE(nullptr, counter); - EXPECT_EQ(1L, counter->value()); - } else if (upstreamProtocol() == FakeHttpConnection::Type::HTTP3) { - // TODO(alyssawilk) http3 stats. - Stats::CounterSharedPtr counter = - TestUtility::findCounter(stats, "cluster.cluster_0.upstream_rq_tx_reset"); + if (upstreamProtocol() != FakeHttpConnection::Type::HTTP1) { + Stats::CounterSharedPtr counter = TestUtility::findCounter( + stats, absl::StrCat("cluster.cluster_0.", upstreamProtocolStatsRoot(), ".tx_reset")); ASSERT_NE(nullptr, counter); EXPECT_EQ(1L, counter->value()); }