Skip to content

test: deflaking yet another test #19775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssawilk merged 4 commits into from
Feb 3, 2022
Merged

test: deflaking yet another test #19775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9be0b81
test: deflaking yet another test
alyssawilk Feb 1, 2022
24a3b7e
comments
alyssawilk Feb 2, 2022
e76c522
update
alyssawilk Feb 2, 2022
6fc3183
format
alyssawilk Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/config/utility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/integration/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Copy Markdown
Contributor

@adisuissa adisuissa Feb 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The call to makeHttpConnection in line 461 should be moved here (as is done in the other test that was updated).

ASSERT_TRUE(response->waitForEndStream());
EXPECT_THAT(response->headers(), HttpStatusIs("403"));
codec_client_->close();
}

{
Expand Down Expand Up @@ -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();
}

{
Expand Down
2 changes: 1 addition & 1 deletion test/integration/multiplexed_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 0 additions & 4 deletions test/integration/protocol_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%");
Expand Down