test: integration test and admin integration test parameterization#1036
Merged
Conversation
Member
|
I just merged envoyproxy/envoy-filter-example#4, can you update this PR with the new |
htuch
reviewed
Jun 1, 2017
Member
htuch
left a comment
htuch
left a comment
There was a problem hiding this comment.
Looks good, mostly questions about ways to reduce the churn..
| fake_upstream_connection = fake_upstreams_[0]->waitForHttpConnection(*dispatcher_); | ||
| }, | ||
| [&]() -> void { request = fake_upstream_connection->waitForNewStream(); }, | ||
| [&]() -> void { request->waitForEndStream(*dispatcher_); }, |
Member
There was a problem hiding this comment.
How come so much churn in formatting? It's a bit harder to pick out the diff here.
| codec_client = makeHttpConnection(lookupPort("http"), Http::CodecClient::Type::HTTP1, version); | ||
| }, | ||
| [&]() -> void { | ||
| codec_client->startRequest(Http::TestHeaderMapImpl{{":method", "GET"}, |
Member
There was a problem hiding this comment.
Formatting here looks weird, the first block is done one way, the next another...
| const std::string& host = "host"); | ||
| makeSingleRequest(uint32_t port, const std::string& method, const std::string& url, | ||
| const std::string& body, Http::CodecClient::Type type, | ||
| Network::Address::IpVersion version = Network::Address::IpVersion::v4, |
Member
There was a problem hiding this comment.
How come this is a parameter of the method? Can't makeSingleRequest call GetIpVersion() (nee GetParam()) to figure it out? Might simplify the call site churn.
Contributor
Author
There was a problem hiding this comment.
I'm not sure. This function is in test/integration/utility.cc
| TEST_P(IntegrationAdminTest, Admin) { | ||
| BufferingStreamDecoderPtr response = IntegrationUtil::makeSingleRequest( | ||
| lookupPort("admin"), "GET", "/", "", Http::CodecClient::Type::HTTP1); | ||
| lookupPort("admin"), "GET", "/", "", Http::CodecClient::Type::HTTP1, GetParam()); |
Member
There was a problem hiding this comment.
Can we add a wrapper method for GetParam() that provides semantic information about what the parameter is? E.g. GetIpVersion()?
Member
|
Could add a wrapper in InregeationBase to pass in the test state.
…On Thu, Jun 1, 2017 at 6:39 PM hennna ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In test/integration/utility.h
<#1036 (comment)>:
> * @param host supplies the host header to use for the request.
* @return BufferingStreamDecoderPtr the complete request or a partial request if there was
* remote easly disconnection.
*/
static BufferingStreamDecoderPtr
- makeSingleRequest(const Network::Address::IpVersion version, uint32_t port,
- const std::string& method, const std::string& url, const std::string& body,
- Http::CodecClient::Type type, const std::string& host = "host");
- // TODO(henna): Deprecate when IPv6 test support is finished.
- static BufferingStreamDecoderPtr makeSingleRequest(uint32_t port, const std::string& method,
- const std::string& url,
- const std::string& body,
- Http::CodecClient::Type type,
- const std::string& host = "host");
+ makeSingleRequest(uint32_t port, const std::string& method, const std::string& url,
+ const std::string& body, Http::CodecClient::Type type,
+ Network::Address::IpVersion version = Network::Address::IpVersion::v4,
I'm not sure. This function is in test/integration/utility.cc
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#1036 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AKaLv3z-heiZ5Sjeul3pxY24mp2HH5Vbks5r_z2UgaJpZM4Nsa1b>
.
|
htuch
pushed a commit
to envoyproxy/envoy-filter-example
that referenced
this pull request
Jun 2, 2017
Updates echo2 integration test to match onging changes in envoyproxy/envoy#1036 .
htuch
previously approved these changes
Jun 2, 2017
Member
htuch
left a comment
htuch
left a comment
There was a problem hiding this comment.
Can you update the CI hash for the example and get the tests passing? Thanks.
htuch
approved these changes
Jun 4, 2017
Member
|
@junr03 @RomanDzhabarov @ccaraman Can one of you take a look at this review? |
ccaraman
approved these changes
Jun 5, 2017
This was referenced Jun 5, 2017
Merged
jpsim
pushed a commit
that referenced
this pull request
Nov 28, 2022
Description: Fixes incorrect signatures for the JNI calls on the trailers callback path in Android. Risk Level: Low Testing: Needs to be covered by AssertionFilter integration tests Signed-off-by: Mike Schore <mike.schore@gmail.com> Signed-off-by: JP Simard <jp@jpsim.com>
jpsim
pushed a commit
that referenced
this pull request
Nov 29, 2022
Description: Fixes incorrect signatures for the JNI calls on the trailers callback path in Android. Risk Level: Low Testing: Needs to be covered by AssertionFilter integration tests Signed-off-by: Mike Schore <mike.schore@gmail.com> Signed-off-by: JP Simard <jp@jpsim.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR parameterizes two integration tests: integration_test.cc and integration_admin_test.cc. The majority of the line changes are plumbing through the parameter
versionto allow code that originally hard coded an IPv4 address to now be parameterized.This is the second step in parameterizing IPv4 and IPv6 testing in the integration tests. The first step was parameterizing the echo_integration_test in #953 . In this PR, we update many of the functions in integration.cc that are called in integration_test.cc to take the parameter
version. Because other integration tests currently also rely on these functions, we set the default value to be Network::Address::IpVersion::v4. In a subsequent PR, we will also parameterize the other integration tests and the default value will be removed.The constructor for RawConnectionDriver and function makeSingleRequest in test/integration/utility.h were also updated to set the default version value to v4. This required reordering the function parameters.
createTestServer and temporaryFileSubstitute were also updated in a similar fashion.
asan and tsan tests passing requires https://github.com/lyft/envoy-filter-example/pull/4/files due to dependence on changes made in this PR.
Supports ongoing work in #351