Skip to content

test: cleaning up some H3 TODOs #16601

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 6 commits into from
May 24, 2021
Merged

test: cleaning up some H3 TODOs #16601

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45b074f
test: cleaning up an obsolete #define
alyssawilk May 20, 2021
a4ba212
format
alyssawilk May 20, 2021
9ef0f89
tossing in a second trivial todo
alyssawilk May 20, 2021
7038a05
good catch
alyssawilk May 24, 2021
5a98cf7
Merge branch 'main' into test_cleanup
alyssawilk May 24, 2021
8f45877
one step back...
alyssawilk May 24, 2021
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
11 changes: 2 additions & 9 deletions test/integration/multiplexed_upstream_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,10 @@ namespace Envoy {

INSTANTIATE_TEST_SUITE_P(Protocols, Http2UpstreamIntegrationTest,
testing::ValuesIn(HttpProtocolIntegrationTest::getProtocolTestParams(
{Http::CodecClient::Type::HTTP2}, {FakeHttpConnection::Type::HTTP2})),
{Http::CodecClient::Type::HTTP2},
{FakeHttpConnection::Type::HTTP2, FakeHttpConnection::Type::HTTP3})),
HttpProtocolIntegrationTest::protocolTestParamsToString);

// TODO(alyssawilk) move #defines into getProtocolTestParams in a follow-up
#ifdef ENVOY_ENABLE_QUIC
INSTANTIATE_TEST_SUITE_P(ProtocolsWithQuic, Http2UpstreamIntegrationTest,
testing::ValuesIn(HttpProtocolIntegrationTest::getProtocolTestParams(
{Http::CodecClient::Type::HTTP2}, {FakeHttpConnection::Type::HTTP3})),
HttpProtocolIntegrationTest::protocolTestParamsToString);
#endif

TEST_P(Http2UpstreamIntegrationTest, RouterRequestAndResponseWithBodyNoBuffer) {
testRouterRequestAndResponseWithBody(1024, 512, false);
}
Expand Down
16 changes: 2 additions & 14 deletions test/integration/protocol_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1964,15 +1964,7 @@ name: encode-headers-return-stop-all-filter
ASSERT_TRUE(response->waitForEndStream());
ASSERT_TRUE(response->complete());
// Data is added in encodeData for all protocols, and encodeTrailers for HTTP/2 and above.
int times_added = (upstreamProtocol() == FakeHttpConnection::Type::HTTP1 ||
downstreamProtocol() == Http::CodecClient::Type::HTTP1)
? 1
: 2;
if (downstreamProtocol() == Http::CodecClient::Type::HTTP1 &&
upstreamProtocol() == FakeHttpConnection::Type::HTTP3) {
// TODO(alyssawilk) Figure out why the bytes mismatch with the test expectation below.
return;
}
int times_added = upstreamProtocol() == FakeHttpConnection::Type::HTTP1 ? 1 : 2;
EXPECT_EQ(count_ * size_ + added_decoded_data_size_ * times_added, response->body().size());
}

Expand Down Expand Up @@ -2016,13 +2008,9 @@ name: encode-headers-return-stop-all-filter
ASSERT_TRUE(response->waitForEndStream());
ASSERT_TRUE(response->complete());
// Data is added in encodeData for all protocols, and encodeTrailers for HTTP/2 and above.
int times_added = (upstreamProtocol() == FakeHttpConnection::Type::HTTP1 ||
downstreamProtocol() == Http::CodecClient::Type::HTTP1)
? 1
: 2;
int times_added = upstreamProtocol() == FakeHttpConnection::Type::HTTP1 ? 1 : 2;
if (downstreamProtocol() == Http::CodecClient::Type::HTTP1 &&
upstreamProtocol() == FakeHttpConnection::Type::HTTP3) {
// TODO(alyssawilk) Figure out why the bytes mismatch with the test expectation below.
Comment thread
asraa marked this conversation as resolved.
return;
}
EXPECT_EQ(count_ * size_ + added_decoded_data_size_ * times_added, response->body().size());
Expand Down