opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xds: rename balancer to xds_experimental during testing (#2850)

Browse Source
This commit is contained in:
Doug Fawley
2019-06-03 10:08:20 -07:00
committed by Menghan Li
parent a69f97005b
commit 99aff99e53
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
balancer/xds/xds.go
View File

@ -42,7 +42,7 @@ import (
const ( const (
defaultTimeout = 10 * time.Second defaultTimeout = 10 * time.Second
xdsName = "xds" xdsName = "xds_experimental"
) )
var ( var (

2
balancer/xds/xds_lrs_test.go
View File

@ -95,7 +95,7 @@ func (s) TestXdsLoadReporting(t *testing.T) {
newEDSBalancer = originalNewEDSBalancer newEDSBalancer = originalNewEDSBalancer
}() }()
builder := balancer.Get("xds") builder := balancer.Get(xdsName)
cc := newTestClientConn() cc := newTestClientConn()
lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer)
if !ok { if !ok {

12
balancer/xds/xds_test.go
View File

@ -239,7 +239,7 @@ func (s) TestXdsBalanceHandleResolvedAddrs(t *testing.T) {
startupTimeout = 500 * time.Millisecond startupTimeout = 500 * time.Millisecond
defer func() { startupTimeout = defaultTimeout }() defer func() { startupTimeout = defaultTimeout }()
builder := balancer.Get("xds") builder := balancer.Get(xdsName)
cc := newTestClientConn() cc := newTestClientConn()
lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer)
if !ok { if !ok {
@ -273,7 +273,7 @@ func (s) TestXdsBalanceHandleBalancerConfigBalancerNameUpdate(t *testing.T) {
newEDSBalancer = originalNewEDSBalancer newEDSBalancer = originalNewEDSBalancer
}() }()
builder := balancer.Get("xds") builder := balancer.Get(xdsName)
cc := newTestClientConn() cc := newTestClientConn()
lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer)
if !ok { if !ok {
@ -348,7 +348,7 @@ func (s) TestXdsBalanceHandleBalancerConfigChildPolicyUpdate(t *testing.T) {
newEDSBalancer = originalNewEDSBalancer newEDSBalancer = originalNewEDSBalancer
}() }()
builder := balancer.Get("xds") builder := balancer.Get(xdsName)
cc := newTestClientConn() cc := newTestClientConn()
lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer)
if !ok { if !ok {
@ -438,7 +438,7 @@ func (s) TestXdsBalanceHandleBalancerConfigFallBackUpdate(t *testing.T) {
newEDSBalancer = originalNewEDSBalancer newEDSBalancer = originalNewEDSBalancer
}() }()
builder := balancer.Get("xds") builder := balancer.Get(xdsName)
cc := newTestClientConn() cc := newTestClientConn()
lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer)
if !ok { if !ok {
@ -513,7 +513,7 @@ func (s) TestXdsBalancerHandlerSubConnStateChange(t *testing.T) {
newEDSBalancer = originalNewEDSBalancer newEDSBalancer = originalNewEDSBalancer
}() }()
builder := balancer.Get("xds") builder := balancer.Get(xdsName)
cc := newTestClientConn() cc := newTestClientConn()
lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer)
if !ok { if !ok {
@ -591,7 +591,7 @@ func (s) TestXdsBalancerFallBackSignalFromEdsBalancer(t *testing.T) {
newEDSBalancer = originalNewEDSBalancer newEDSBalancer = originalNewEDSBalancer
}() }()
builder := balancer.Get("xds") builder := balancer.Get(xdsName)
cc := newTestClientConn() cc := newTestClientConn()
lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer)
if !ok { if !ok {