Skip to content
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

Jump to bottom

test: remove CONSTRUCT_ON_FIRST_USE from ads_integration_test #8272

Merged
merged 3 commits into from
Sep 18, 2019
Merged

test: remove CONSTRUCT_ON_FIRST_USE from ads_integration_test #8272

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fd76ba
remove CONSTRUCT_ON_FIRST_USE from ads_integration_test
fredlas Sep 17, 2019
94b809d
Merge remote-tracking branch 'upstream/master' into DLB_delta_test_co…
fredlas Sep 17, 2019
87d031d
and add a comment so it doesnt get added back in
fredlas Sep 17, 2019
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
7 changes: 4 additions & 3 deletions test/integration/ads_integration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
#include "test/integration/http_integration.h"

namespace Envoy {
static const std::string& AdsIntegrationConfig() {
CONSTRUCT_ON_FIRST_USE(std::string, R"EOF(
static std::string AdsIntegrationConfig() {
// Note: do not use CONSTRUCT_ON_FIRST_USE here!
return R"EOF(
dynamic_resources:
lds_config: {ads: {}}
cds_config: {ads: {}}
Expand All @@ -38,7 +39,7 @@ static const std::string& AdsIntegrationConfig() {
socket_address:
address: 127.0.0.1
port_value: 0
)EOF");
)EOF";
}

class AdsIntegrationTest : public Grpc::GrpcClientIntegrationParamTest, public HttpIntegrationTest {
Expand Down