Skip to content

Commit 028242f

Browse files
authored
xds: fix flaky test due to balancerV2 API update (#2799)
1 parent 42baa8b commit 028242f

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

balancer/xds/xds_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,10 @@ func (s) TestXdsBalanceHandleBalancerConfigFallbackUpdate(t *testing.T) {
485485
ServiceConfig: constructServiceConfigFromXdsConfig(cfg),
486486
})
487487

488+
addrs := []resolver.Address{{Addr: "1.1.1.1:10001"}, {Addr: "2.2.2.2:10002"}, {Addr: "3.3.3.3:10003"}}
488489
cfg.FallbackPolicy = []lbPolicy{fakeBalancerB}
489490
lb.UpdateResolverState(resolver.State{
491+
Addresses: addrs,
490492
ServiceConfig: constructServiceConfigFromXdsConfig(cfg),
491493
})
492494

@@ -505,12 +507,6 @@ func (s) TestXdsBalanceHandleBalancerConfigFallbackUpdate(t *testing.T) {
505507

506508
cleanup()
507509

508-
addrs := []resolver.Address{{Addr: "1.1.1.1:10001"}, {Addr: "2.2.2.2:10002"}, {Addr: "3.3.3.3:10003"}}
509-
lb.UpdateResolverState(resolver.State{
510-
Addresses: addrs,
511-
ServiceConfig: constructServiceConfigFromXdsConfig(cfg),
512-
})
513-
514510
// verify fallback balancer B takes over
515511
select {
516512
case nsc := <-cc.newSubConns:

0 commit comments

Comments
 (0)