Skip to content

Commit

Permalink
xds: fix flaky test due to balancerV2 API update (#2799)
Browse files Browse the repository at this point in the history
  • Loading branch information
lyuxuan authored May 2, 2019
1 parent 42baa8b commit 028242f
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions balancer/xds/xds_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,10 @@ func (s) TestXdsBalanceHandleBalancerConfigFallbackUpdate(t *testing.T) {
ServiceConfig: constructServiceConfigFromXdsConfig(cfg),
})

addrs := []resolver.Address{{Addr: "1.1.1.1:10001"}, {Addr: "2.2.2.2:10002"}, {Addr: "3.3.3.3:10003"}}
cfg.FallbackPolicy = []lbPolicy{fakeBalancerB}
lb.UpdateResolverState(resolver.State{
Addresses: addrs,
ServiceConfig: constructServiceConfigFromXdsConfig(cfg),
})

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

cleanup()

addrs := []resolver.Address{{Addr: "1.1.1.1:10001"}, {Addr: "2.2.2.2:10002"}, {Addr: "3.3.3.3:10003"}}
lb.UpdateResolverState(resolver.State{
Addresses: addrs,
ServiceConfig: constructServiceConfigFromXdsConfig(cfg),
})

// verify fallback balancer B takes over
select {
case nsc := <-cc.newSubConns:
Expand Down

0 comments on commit 028242f

Please sign in to comment.