Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
load("@envoy//bazel:cc_configure.bzl", "cc_configure")

envoy_dependencies()

cc_configure()
6 changes: 3 additions & 3 deletions echo2_integration_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Echo2IntegrationTest : public BaseIntegrationTest,
* Initializer for an individual integration test.
*/
void SetUp() override {
createTestServer("echo2_server.json", GetParam(), {"echo"});
createTestServer("echo2_server.json", {"echo"}, GetParam());
}

/**
Expand All @@ -26,12 +26,12 @@ INSTANTIATE_TEST_CASE_P(IpVersions, Echo2IntegrationTest,
TEST_P(Echo2IntegrationTest, Echo) {
Buffer::OwnedImpl buffer("hello");
std::string response;
RawConnectionDriver connection(lookupPort("echo"), GetParam(), buffer,
RawConnectionDriver connection(lookupPort("echo"), buffer,
[&](Network::ClientConnection&, const Buffer::Instance& data)
-> void {
response.append(TestUtility::bufferToString(data));
connection.close();
});
}, GetParam());

connection.run();
EXPECT_EQ("hello", response);
Expand Down
4 changes: 3 additions & 1 deletion echo2_server.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
]
}],

"admin": { "access_log_path": "/dev/null", "profile_path": "{{ test_tmpdir }}/envoy.prof", "address": "tcp://127.0.0.1:0" },
"admin": { "access_log_path": "/dev/null",
"profile_path": "{{ test_tmpdir }}/envoy.prof",
"address": "tcp://{{ ip_loopback_address }}:0" },

"cluster_manager": {
"clusters": []
Expand Down