Skip to content

[test] fix protocol integration test flake #10437

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
mattklein123 merged 1 commit into from
Mar 19, 2020
Merged

[test] fix protocol integration test flake #10437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions test/integration/protocol_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,21 +991,21 @@ TEST_P(DownstreamProtocolIntegrationTest, ManyRequestTrailersRejected) {

initialize();
codec_client_ = makeHttpConnection(lookupPort("http"));
fake_upstreams_[0]->set_allow_unexpected_disconnects(true);
auto encoder_decoder = codec_client_->startRequest(default_request_headers_);
request_encoder_ = &encoder_decoder.first;
auto response = std::move(encoder_decoder.second);
codec_client_->sendData(*request_encoder_, 1, false);
codec_client_->sendTrailers(*request_encoder_, request_trailers);

// Expect rejection.
// TODO(asraa): we shouldn't need this unexpected disconnect, but some tests hit unparented
// connections without it. Likely need to reconsider whether the waits/closes should be on
// client or upstream.
fake_upstreams_[0]->set_allow_unexpected_disconnects(true);
ASSERT_TRUE(fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection_));
response->waitForReset();
ASSERT_TRUE(fake_upstream_connection_->close());
ASSERT_TRUE(fake_upstream_connection_->waitForDisconnect());
if (downstream_protocol_ == Http::CodecClient::Type::HTTP1) {
codec_client_->waitForDisconnect();
EXPECT_TRUE(response->complete());
EXPECT_EQ("431", response->headers().Status()->value().getStringView());
} else {
response->waitForReset();
codec_client_->close();
}
}

TEST_P(DownstreamProtocolIntegrationTest, ManyRequestTrailersAccepted) {
Expand Down