Merge pull request #21686 from yashykt/masterfix

Fix xds_end2end_test

test/cpp/end2end/xds_end2end_test.cc

@@ -1341,7 +1341,7 @@ using CdsTest = BasicTest;
 TEST_P(CdsTest, Vanilla) {
   SetNextResolution({});
   SetNextResolutionForLbChannelAllBalancers();
-  SendRpc();
+  CheckRpcSendOk();
   EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
             AdsServiceImpl::ACKED);
 }
@@ -1355,7 +1355,7 @@ TEST_P(CdsTest, WrongClusterType) {
       {{"application_target_name", std::move(cluster)}});
   SetNextResolution({});
   SetNextResolutionForLbChannelAllBalancers();
-  SendRpc();
+  CheckRpcSendOk();
   EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
             AdsServiceImpl::NACKED);
 }
@@ -1369,7 +1369,7 @@ TEST_P(CdsTest, WrongEdsConfig) {
       {{"application_target_name", std::move(cluster)}});
   SetNextResolution({});
   SetNextResolutionForLbChannelAllBalancers();
-  SendRpc();
+  CheckRpcSendOk();
   EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
             AdsServiceImpl::NACKED);
 }
@@ -1383,7 +1383,7 @@ TEST_P(CdsTest, WrongLbPolicy) {
       {{"application_target_name", std::move(cluster)}});
   SetNextResolution({});
   SetNextResolutionForLbChannelAllBalancers();
-  SendRpc();
+  CheckRpcSendOk();
   EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
             AdsServiceImpl::NACKED);
 }
@@ -1397,7 +1397,7 @@ TEST_P(CdsTest, WrongLrsServer) {
       {{"application_target_name", std::move(cluster)}});
   SetNextResolution({});
   SetNextResolutionForLbChannelAllBalancers();
-  SendRpc();
+  CheckRpcSendOk();
   EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
             AdsServiceImpl::NACKED);
 }