Skip to content

Commit

Permalink
test: remove CONSTRUCT_ON_FIRST_USE from ads_integration_test (envoyp…
Browse files Browse the repository at this point in the history
…roxy#8272)

This string constant is not constant when ads_integration_test is parameterized on delta/SotW.

Risk Level: none
Testing: test-only change
Doc Changes: n /a
Release Notes:  n/a

Signed-off-by: Fred Douglas <fredlas@google.com>
  • Loading branch information
fredlas committed Sep 24, 2019
1 parent 8e76926 commit 5694132
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions test/integration/ads_integration.h
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

0 comments on commit 5694132

Please sign in to comment.