Merge remote-tracking branch 'upstream/master' into xds_cluster_e2e_flake

2 months ago · 68edb080da
parent bbd283154e ed3d6c0d62
commit 68edb080da
1 changed files with 0 additions and 2 deletions
--- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
@ -1551,8 +1551,6 @@ TEST_P(FailoverTest, MoveAllLocalitiesInCurrentPriorityToHigherPriority) {
  balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
  // When backend 2 gets traffic, we know the second update has been seen.
  WaitForBackend(DEBUG_LOCATION, 2);
-  // The xDS server got at least 1 response.
-  EXPECT_TRUE(balancer_->ads_service()->eds_response_state().has_value());
 }

 // This tests a bug triggered by the xds_cluster_resolver policy reusing