Skip to content

test: deflaking header_integration_test #3849

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
htuch merged 1 commit into from
Jul 12, 2018
Merged

test: deflaking header_integration_test #3849

Show file tree
Hide file tree
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
10 changes: 4 additions & 6 deletions test/integration/header_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,13 @@ class HeaderIntegrationTest

void TearDown() override {
if (eds_connection_ != nullptr) {
// Don't ASSERT fail if an EDS reconnect ends up unparented.
fake_upstreams_[1]->set_allow_unexpected_disconnects(true);
eds_connection_->close();
eds_connection_->waitForDisconnect();
eds_connection_.reset();
}
cleanupUpstreamAndDownstream();
test_server_.reset();
fake_upstream_connection_.reset();
fake_upstreams_.clear();
Expand Down Expand Up @@ -353,13 +356,8 @@ class HeaderIntegrationTest
Http::TestHeaderMapImpl&& response_headers,
Http::TestHeaderMapImpl&& expected_response_headers) {
registerTestServerPorts({"http"});

codec_client_ = makeHttpConnection(makeClientConnection(lookupPort("http")));
auto response = codec_client_->makeHeaderOnlyRequest(request_headers);
waitForNextUpstreamRequest();

upstream_request_->encodeHeaders(response_headers, true);
response->waitForEndStream();
auto response = sendRequestAndWaitForResponse(request_headers, 0, response_headers, 0);

compareHeaders(upstream_request_->headers(), expected_request_headers);
compareHeaders(response->headers(), expected_response_headers);
Expand Down
5 changes: 3 additions & 2 deletions test/integration/http_integration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,9 @@ void HttpIntegrationTest::setDownstreamProtocol(Http::CodecClient::Type downstre
}

IntegrationStreamDecoderPtr HttpIntegrationTest::sendRequestAndWaitForResponse(
Http::TestHeaderMapImpl& request_headers, uint32_t request_body_size,
Http::TestHeaderMapImpl& response_headers, uint32_t response_size) {
const Http::TestHeaderMapImpl& request_headers, uint32_t request_body_size,
const Http::TestHeaderMapImpl& response_headers, uint32_t response_size) {
ASSERT(codec_client_ != nullptr);
// Send the request to Envoy.
IntegrationStreamDecoderPtr response;
if (request_body_size) {
Expand Down
4 changes: 2 additions & 2 deletions test/integration/http_integration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ class HttpIntegrationTest : public BaseIntegrationTest {
// Waits for the complete downstream response before returning.
// Requires |codec_client_| to be initialized.
IntegrationStreamDecoderPtr sendRequestAndWaitForResponse(
Http::TestHeaderMapImpl& request_headers, uint32_t request_body_size,
Http::TestHeaderMapImpl& response_headers, uint32_t response_body_size);
const Http::TestHeaderMapImpl& request_headers, uint32_t request_body_size,
const Http::TestHeaderMapImpl& response_headers, uint32_t response_body_size);

// Wait for the end of stream on the next upstream stream on fake_upstreams_
// Sets fake_upstream_connection_ to the connection and upstream_request_ to stream.
Expand Down