From a4f39d5c92d9a30748263cb17c67b011351d4267 Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Mon, 26 Aug 2019 10:11:04 -0400 Subject: [PATCH 1/2] test: adding debug hints Signed-off-by: Alyssa Wilk --- .../filters/http/cors/cors_filter_integration_test.cc | 6 +----- test/integration/integration.cc | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/extensions/filters/http/cors/cors_filter_integration_test.cc b/test/extensions/filters/http/cors/cors_filter_integration_test.cc index 6c78c1892313..bca2bcff0c63 100644 --- a/test/extensions/filters/http/cors/cors_filter_integration_test.cc +++ b/test/extensions/filters/http/cors/cors_filter_integration_test.cc @@ -34,11 +34,7 @@ class CorsFilterIntegrationTest : public testing::TestWithParamadd_routes(); route->mutable_match()->set_prefix("/no-cors"); route->mutable_route()->set_cluster("cluster_0"); - route->mutable_route() - ->mutable_cors() - ->mutable_filter_enabled() - ->mutable_default_value() - ->set_numerator(0); + route->mutable_route()->mutable_cors()->mutable_enabled()->set_value(false); } { diff --git a/test/integration/integration.cc b/test/integration/integration.cc index f8fe1910abf1..595c78f1e24b 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -442,7 +442,8 @@ void BaseIntegrationTest::createGeneratedApiTestServer(const std::string& bootst if (!allow_lds_rejection) { RELEASE_ASSERT(test_server_->counter(rejected) == nullptr || test_server_->counter(rejected)->value() == 0, - "Lds update failed"); + "Lds update failed. For details, run test with -l trace and look for " + "\"Error adding/updating listener(s)\" in the logs."); } time_system_.sleep(std::chrono::milliseconds(10)); } From 246be91124e9652f2a725e336b637569bef464fb Mon Sep 17 00:00:00 2001 From: Alyssa Wilk Date: Mon, 26 Aug 2019 11:46:07 -0400 Subject: [PATCH 2/2] fixup Signed-off-by: Alyssa Wilk --- .../filters/http/cors/cors_filter_integration_test.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/extensions/filters/http/cors/cors_filter_integration_test.cc b/test/extensions/filters/http/cors/cors_filter_integration_test.cc index bca2bcff0c63..6c78c1892313 100644 --- a/test/extensions/filters/http/cors/cors_filter_integration_test.cc +++ b/test/extensions/filters/http/cors/cors_filter_integration_test.cc @@ -34,7 +34,11 @@ class CorsFilterIntegrationTest : public testing::TestWithParamadd_routes(); route->mutable_match()->set_prefix("/no-cors"); route->mutable_route()->set_cluster("cluster_0"); - route->mutable_route()->mutable_cors()->mutable_enabled()->set_value(false); + route->mutable_route() + ->mutable_cors() + ->mutable_filter_enabled() + ->mutable_default_value() + ->set_numerator(0); } {