From a0fb35102397d938ebaed74101ec27f337dc6fcf Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Mon, 31 Oct 2022 17:15:34 -0700 Subject: [PATCH] xds_core_e2e_test: fix federation test flake (#31487) --- test/cpp/end2end/xds/xds_core_end2end_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc index 7ed3048c606..b496a3c422a 100644 --- a/test/cpp/end2end/xds/xds_core_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc @@ -714,7 +714,7 @@ TEST_P(XdsFederationTest, FederationTargetNoAuthorityWithResourceTemplate) { "xdstp://xds.example.com/envoy.config.listener.v3.Listener" "client/%s?client_listener_resource_name_template_not_in_use"); InitClient(builder); - CreateAndStartBackends(2, /*xds_enabled=*/true); + CreateAndStartBackends(2); // Eds for the new authority balancer. EdsResourceArgs args = EdsResourceArgs({{"locality0", CreateEndpointsForBackends()}}); @@ -764,7 +764,7 @@ TEST_P(XdsFederationTest, FederationTargetAuthorityDefaultResourceTemplate) { builder.AddAuthority(kAuthority, absl::StrCat("localhost:", authority_balancer_->port())); InitClient(builder); - CreateAndStartBackends(2, /*xds_enabled=*/true); + CreateAndStartBackends(2); // Eds for 2 balancers to ensure RPCs sent using current stub go to backend 0 // and RPCs sent using the new stub go to backend 1. EdsResourceArgs args({{"locality0", CreateEndpointsForBackends(0, 1)}}); @@ -835,7 +835,7 @@ TEST_P(XdsFederationTest, FederationTargetAuthorityWithResourceTemplate) { absl::StrCat("localhost:", authority_balancer_->port()), kNewListenerTemplate); InitClient(builder); - CreateAndStartBackends(2, /*xds_enabled=*/true); + CreateAndStartBackends(2); // Eds for 2 balancers to ensure RPCs sent using current stub go to backend 0 // and RPCs sent using the new stub go to backend 1. EdsResourceArgs args({{"locality0", CreateEndpointsForBackends(0, 1)}});