diff --git a/test/config/utility.cc b/test/config/utility.cc index 66dde247121c6..8de3098dc07c7 100644 --- a/test/config/utility.cc +++ b/test/config/utility.cc @@ -172,7 +172,7 @@ std::string ConfigHelper::httpProxyConfig(bool downstream_use_quic) { "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager stat_prefix: config_test delayed_close_timeout: - nanos: 100 + nanos: 10000000 http_filters: name: envoy.filters.http.router codec_type: HTTP1 diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc index ab75975b32e81..a326391b669e8 100644 --- a/test/integration/integration_test.cc +++ b/test/integration/integration_test.cc @@ -458,12 +458,12 @@ name: matcher initialize(); - codec_client_ = makeHttpConnection(lookupPort("http")); - { + codec_client_ = makeHttpConnection(lookupPort("http")); auto response = codec_client_->makeRequestWithBody(default_request_headers_, 1024); ASSERT_TRUE(response->waitForEndStream()); EXPECT_THAT(response->headers(), HttpStatusIs("403")); + codec_client_->close(); } { @@ -524,12 +524,12 @@ name: matcher initialize(); - codec_client_ = makeHttpConnection(lookupPort("http")); - { + codec_client_ = makeHttpConnection(lookupPort("http")); auto response = codec_client_->makeRequestWithBody(default_request_headers_, 1024); ASSERT_TRUE(response->waitForEndStream()); EXPECT_THAT(response->headers(), HttpStatusIs("403")); + codec_client_->close(); } { diff --git a/test/integration/multiplexed_integration_test.cc b/test/integration/multiplexed_integration_test.cc index 18196daf40d16..3fef0ab4d56e1 100644 --- a/test/integration/multiplexed_integration_test.cc +++ b/test/integration/multiplexed_integration_test.cc @@ -1345,7 +1345,7 @@ TEST_P(MultiplexedIntegrationTest, DelayedCloseDisabled) { EXCLUDE_DOWNSTREAM_HTTP3; // Needs HTTP/3 "bad frame" equivalent. config_helper_.addConfigModifier( [](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& - hcm) { hcm.mutable_delayed_close_timeout()->set_seconds(0); }); + hcm) { hcm.mutable_delayed_close_timeout()->set_nanos(0); }); initialize(); std::string response; auto connection = createConnectionDriver( diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc index 7f6599d444de0..9410bfe7eba83 100644 --- a/test/integration/protocol_integration_test.cc +++ b/test/integration/protocol_integration_test.cc @@ -3454,10 +3454,6 @@ TEST_P(DownstreamProtocolIntegrationTest, HandleDownstreamSocketFail) { } TEST_P(ProtocolIntegrationTest, HandleUpstreamSocketFail) { -#ifdef WIN32 - // Debug info for https://github.com/envoyproxy/envoy/issues/19430 - LogLevelSetter save_levels(spdlog::level::trace); -#endif SocketInterfaceSwap socket_swap; useAccessLog("%RESPONSE_CODE_DETAILS%");