Skip to content

Commit

Permalink
Merge pull request grpc#21703 from yashykt/xdsfix
Browse files Browse the repository at this point in the history
Fix 21686 to use the correct status
  • Loading branch information
yashykt authored Jan 17, 2020
2 parents 5969ce6 + 48139eb commit 659653d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test/cpp/end2end/xds_end2end_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,7 @@ using CdsTest = BasicTest;
TEST_P(CdsTest, Vanilla) {
SetNextResolution({});
SetNextResolutionForLbChannelAllBalancers();
CheckRpcSendOk();
CheckRpcSendFailure();
EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
AdsServiceImpl::ACKED);
}
Expand All @@ -1355,7 +1355,7 @@ TEST_P(CdsTest, WrongClusterType) {
{{"application_target_name", std::move(cluster)}});
SetNextResolution({});
SetNextResolutionForLbChannelAllBalancers();
CheckRpcSendOk();
CheckRpcSendFailure();
EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
AdsServiceImpl::NACKED);
}
Expand All @@ -1369,7 +1369,7 @@ TEST_P(CdsTest, WrongEdsConfig) {
{{"application_target_name", std::move(cluster)}});
SetNextResolution({});
SetNextResolutionForLbChannelAllBalancers();
CheckRpcSendOk();
CheckRpcSendFailure();
EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
AdsServiceImpl::NACKED);
}
Expand All @@ -1383,7 +1383,7 @@ TEST_P(CdsTest, WrongLbPolicy) {
{{"application_target_name", std::move(cluster)}});
SetNextResolution({});
SetNextResolutionForLbChannelAllBalancers();
CheckRpcSendOk();
CheckRpcSendFailure();
EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
AdsServiceImpl::NACKED);
}
Expand All @@ -1397,7 +1397,7 @@ TEST_P(CdsTest, WrongLrsServer) {
{{"application_target_name", std::move(cluster)}});
SetNextResolution({});
SetNextResolutionForLbChannelAllBalancers();
CheckRpcSendOk();
CheckRpcSendFailure();
EXPECT_EQ(balancers_[0]->ads_service()->cds_response_state(),
AdsServiceImpl::NACKED);
}
Expand Down

0 comments on commit 659653d

Please sign in to comment.