ringhash: Replace DNS resolver before sending xDS Update in test (grp…

…c#8091)
easwars · Feb 17, 2025 · ae2a04f · ae2a04f
1 parent e55819e
commit ae2a04f
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/xds/internal/balancer/ringhash/e2e/ringhash_balancer_test.go b/xds/internal/balancer/ringhash/e2e/ringhash_balancer_test.go
@@ -467,13 +467,14 @@ func (s) TestRingHash_AggregateClusterFallBackFromRingHashToLogicalDnsAtStartup(
 		Routes:    []*v3routepb.RouteConfiguration{route},
 		Listeners: []*v3listenerpb.Listener{listener},
 	}
-	if err := xdsServer.Update(ctx, updateOpts); err != nil {
-		t.Fatalf("Failed to update xDS resources: %v", err)
-	}
 
 	dnsR := replaceDNSResolver(t)
 	dnsR.InitialState(resolver.State{Addresses: []resolver.Address{{Addr: backends[0]}}})
 
+	if err := xdsServer.Update(ctx, updateOpts); err != nil {
+		t.Fatalf("Failed to update xDS resources: %v", err)
+	}
+
 	conn, err := grpc.NewClient("xds:///test.server", grpc.WithResolvers(xdsResolver), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("Failed to create client: %s", err)
@@ -544,13 +545,14 @@ func (s) TestRingHash_AggregateClusterFallBackFromRingHashToLogicalDnsAtStartupN
 		Routes:    []*v3routepb.RouteConfiguration{route},
 		Listeners: []*v3listenerpb.Listener{listener},
 	}
-	if err := xdsServer.Update(ctx, updateOpts); err != nil {
-		t.Fatalf("Failed to update xDS resources: %v", err)
-	}
 
 	dnsR := replaceDNSResolver(t)
 	dnsR.InitialState(resolver.State{Addresses: []resolver.Address{{Addr: backends[0]}}})
 
+	if err := xdsServer.Update(ctx, updateOpts); err != nil {
+		t.Fatalf("Failed to update xDS resources: %v", err)
+	}
+
 	dialer := testutils.NewBlockingDialer()
 	cp := grpc.ConnectParams{
 		// Increase backoff time, so that subconns stay in TRANSIENT_FAILURE