From 1490b5a24e10d4731cbcececd923e5d28f4e7d23 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 28 Jan 2020 12:47:37 -0800 Subject: [PATCH 1/2] Fix unused-result errors on import. --- test/cpp/end2end/xds_end2end_test.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/cpp/end2end/xds_end2end_test.cc b/test/cpp/end2end/xds_end2end_test.cc index 71977f8249361..b18e1a8424aa9 100644 --- a/test/cpp/end2end/xds_end2end_test.cc +++ b/test/cpp/end2end/xds_end2end_test.cc @@ -1501,7 +1501,7 @@ using LdsTest = BasicTest; TEST_P(LdsTest, Vanilla) { SetNextResolution({}); SetNextResolutionForLbChannelAllBalancers(); - SendRpc(); + (void)SendRpc(); EXPECT_EQ(balancers_[0]->ads_service()->lds_response_state(), AdsServiceImpl::ACKED); } @@ -1571,7 +1571,7 @@ TEST_P(LdsTest, ChooseMatchedDomain) { AdsServiceImpl::BuildListener(route_config)}}); SetNextResolution({}); SetNextResolutionForLbChannelAllBalancers(); - SendRpc(); + (void)SendRpc(); EXPECT_EQ(balancers_[0]->ads_service()->lds_response_state(), AdsServiceImpl::ACKED); } @@ -1592,7 +1592,7 @@ TEST_P(LdsTest, ChooseLastRoute) { AdsServiceImpl::BuildListener(route_config)}}); SetNextResolution({}); SetNextResolutionForLbChannelAllBalancers(); - SendRpc(); + (void)SendRpc(); EXPECT_EQ(balancers_[0]->ads_service()->lds_response_state(), AdsServiceImpl::ACKED); } @@ -1667,7 +1667,7 @@ TEST_P(RdsTest, Vanilla) { balancers_[0]->ads_service()->SetLdsToUseDynamicRds(); SetNextResolution({}); SetNextResolutionForLbChannelAllBalancers(); - SendRpc(); + (void)SendRpc(); EXPECT_EQ(balancers_[0]->ads_service()->rds_response_state(), AdsServiceImpl::ACKED); } @@ -1706,7 +1706,7 @@ TEST_P(RdsTest, ChooseMatchedDomain) { {{"application_target_name", std::move(route_config)}}); SetNextResolution({}); SetNextResolutionForLbChannelAllBalancers(); - SendRpc(); + (void)SendRpc(); EXPECT_EQ(balancers_[0]->ads_service()->rds_response_state(), AdsServiceImpl::ACKED); } @@ -1727,7 +1727,7 @@ TEST_P(RdsTest, ChooseLastRoute) { {{"application_target_name", std::move(route_config)}}); SetNextResolution({}); SetNextResolutionForLbChannelAllBalancers(); - SendRpc(); + (void)SendRpc(); EXPECT_EQ(balancers_[0]->ads_service()->rds_response_state(), AdsServiceImpl::ACKED); } @@ -1802,7 +1802,7 @@ using CdsTest = BasicTest; TEST_P(CdsTest, Vanilla) { SetNextResolution({}); SetNextResolutionForLbChannelAllBalancers(); - SendRpc(); + (void)SendRpc(); EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(), AdsServiceImpl::ACKED); } From cb6168667ce113f06a15332df2aea5fda025f1d9 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 28 Jan 2020 13:29:52 -0800 Subject: [PATCH 2/2] remove unused "using" declaration --- test/cpp/end2end/xds_end2end_test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/test/cpp/end2end/xds_end2end_test.cc b/test/cpp/end2end/xds_end2end_test.cc index b18e1a8424aa9..f86d032a87849 100644 --- a/test/cpp/end2end/xds_end2end_test.cc +++ b/test/cpp/end2end/xds_end2end_test.cc @@ -94,7 +94,6 @@ using ::envoy::api::v2::FractionalPercent; using ::envoy::api::v2::HttpConnectionManager; using ::envoy::api::v2::Listener; using ::envoy::api::v2::RouteConfiguration; -using ::envoy::api::v2::VirtualHost; using ::envoy::service::discovery::v2::AggregatedDiscoveryService; using ::envoy::service::load_stats::v2::ClusterStats; using ::envoy::service::load_stats::v2::LoadReportingService;