Skip to content

Commit e2d69aa

Browse files
kylejbkylejb
authored
tests: fix spelling of variable (#5966)
1 parent a6376c9 commit e2d69aa

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

‎xds/internal/balancer/clusterresolver/clusterresolver_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
const (
4747
defaultTestTimeout = 5 * time.Second
4848
defaultTestShortTimeout = 10 * time.Millisecond
49-
testEDSServcie = "test-eds-service-name"
49+
testEDSService = "test-eds-service-name"
5050
testClusterName = "test-cluster-name"
5151
testClusterName2 = "google_cfe_some-name"
5252
)
@@ -104,7 +104,7 @@ func (t *noopTestClientConn) NewSubConn([]resolver.Address, balancer.NewSubConnO
104104
return nil, nil
105105
}
106106

107-
func (noopTestClientConn) Target() string { return testEDSServcie }
107+
func (noopTestClientConn) Target() string { return testEDSService }
108108

109109
type scStateChange struct {
110110
sc balancer.SubConn
@@ -234,7 +234,7 @@ func (s) TestSubConnStateChange(t *testing.T) {
234234

235235
if err := edsB.UpdateClientConnState(balancer.ClientConnState{
236236
ResolverState: xdsclient.SetClient(resolver.State{}, xdsC),
237-
BalancerConfig: newLBConfigWithOneEDS(testEDSServcie),
237+
BalancerConfig: newLBConfigWithOneEDS(testEDSService),
238238
}); err != nil {
239239
t.Fatalf("edsB.UpdateClientConnState() failed: %v", err)
240240
}
@@ -282,7 +282,7 @@ func (s) TestErrorFromXDSClientUpdate(t *testing.T) {
282282
defer cancel()
283283
if err := edsB.UpdateClientConnState(balancer.ClientConnState{
284284
ResolverState: xdsclient.SetClient(resolver.State{}, xdsC),
285-
BalancerConfig: newLBConfigWithOneEDS(testEDSServcie),
285+
BalancerConfig: newLBConfigWithOneEDS(testEDSService),
286286
}); err != nil {
287287
t.Fatal(err)
288288
}
@@ -336,7 +336,7 @@ func (s) TestErrorFromXDSClientUpdate(t *testing.T) {
336336
// An update with the same service name should not trigger a new watch.
337337
if err := edsB.UpdateClientConnState(balancer.ClientConnState{
338338
ResolverState: xdsclient.SetClient(resolver.State{}, xdsC),
339-
BalancerConfig: newLBConfigWithOneEDS(testEDSServcie),
339+
BalancerConfig: newLBConfigWithOneEDS(testEDSService),
340340
}); err != nil {
341341
t.Fatal(err)
342342
}
@@ -370,7 +370,7 @@ func (s) TestErrorFromResolver(t *testing.T) {
370370
defer cancel()
371371
if err := edsB.UpdateClientConnState(balancer.ClientConnState{
372372
ResolverState: xdsclient.SetClient(resolver.State{}, xdsC),
373-
BalancerConfig: newLBConfigWithOneEDS(testEDSServcie),
373+
BalancerConfig: newLBConfigWithOneEDS(testEDSService),
374374
}); err != nil {
375375
t.Fatal(err)
376376
}
@@ -421,7 +421,7 @@ func (s) TestErrorFromResolver(t *testing.T) {
421421
// the previous watch was canceled.
422422
if err := edsB.UpdateClientConnState(balancer.ClientConnState{
423423
ResolverState: xdsclient.SetClient(resolver.State{}, xdsC),
424-
BalancerConfig: newLBConfigWithOneEDS(testEDSServcie),
424+
BalancerConfig: newLBConfigWithOneEDS(testEDSService),
425425
}); err != nil {
426426
t.Fatal(err)
427427
}
@@ -549,7 +549,7 @@ func (s) TestOutlierDetection(t *testing.T) {
549549
// level.
550550
if err := edsB.UpdateClientConnState(balancer.ClientConnState{
551551
ResolverState: xdsclient.SetClient(resolver.State{}, xdsC),
552-
BalancerConfig: newLBConfigWithOneEDSAndOutlierDetection(testEDSServcie, noopODCfg),
552+
BalancerConfig: newLBConfigWithOneEDSAndOutlierDetection(testEDSService, noopODCfg),
553553
}); err != nil {
554554
t.Fatal(err)
555555
}

‎xds/internal/balancer/clusterresolver/config_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func TestParseConfig(t *testing.T) {
187187
LoadReportingServer: testLRSServerConfig,
188188
MaxConcurrentRequests: newUint32(testMaxRequests),
189189
Type: DiscoveryMechanismTypeEDS,
190-
EDSServiceName: testEDSServcie,
190+
EDSServiceName: testEDSService,
191191
},
192192
},
193193
XDSLBPolicy: nil,
@@ -204,7 +204,7 @@ func TestParseConfig(t *testing.T) {
204204
LoadReportingServer: testLRSServerConfig,
205205
MaxConcurrentRequests: newUint32(testMaxRequests),
206206
Type: DiscoveryMechanismTypeEDS,
207-
EDSServiceName: testEDSServcie,
207+
EDSServiceName: testEDSService,
208208
},
209209
{
210210
Type: DiscoveryMechanismTypeLogicalDNS,
@@ -224,7 +224,7 @@ func TestParseConfig(t *testing.T) {
224224
LoadReportingServer: testLRSServerConfig,
225225
MaxConcurrentRequests: newUint32(testMaxRequests),
226226
Type: DiscoveryMechanismTypeEDS,
227-
EDSServiceName: testEDSServcie,
227+
EDSServiceName: testEDSService,
228228
},
229229
},
230230
XDSLBPolicy: &internalserviceconfig.BalancerConfig{
@@ -244,7 +244,7 @@ func TestParseConfig(t *testing.T) {
244244
LoadReportingServer: testLRSServerConfig,
245245
MaxConcurrentRequests: newUint32(testMaxRequests),
246246
Type: DiscoveryMechanismTypeEDS,
247-
EDSServiceName: testEDSServcie,
247+
EDSServiceName: testEDSService,
248248
},
249249
},
250250
XDSLBPolicy: &internalserviceconfig.BalancerConfig{

‎xds/internal/balancer/clusterresolver/configbuilder_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -588,12 +588,12 @@ func TestPriorityLocalitiesToClusterImpl(t *testing.T) {
588588
mechanism: DiscoveryMechanism{
589589
Cluster: testClusterName,
590590
Type: DiscoveryMechanismTypeEDS,
591-
EDSServiceName: testEDSServcie,
591+
EDSServiceName: testEDSService,
592592
},
593593
// lrsServer is nil, so LRS policy will not be used.
594594
wantConfig: &clusterimpl.LBConfig{
595595
Cluster: testClusterName,
596-
EDSServiceName: testEDSServcie,
596+
EDSServiceName: testEDSService,
597597
ChildPolicy: &internalserviceconfig.BalancerConfig{
598598
Name: weightedtarget.Name,
599599
Config: &weightedtarget.LBConfig{

‎xds/internal/balancer/clusterresolver/priority_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ func setupTestEDS(t *testing.T, initChild *internalserviceconfig.BalancerConfig)
6262
xdsC := fakeclient.NewClientWithName(testBalancerNameFooBar)
6363
cc := testutils.NewTestClientConn(t)
6464
builder := balancer.Get(Name)
65-
// TODO: @kylejb will fix typo for 'testEDSServcie' in another PR
66-
edsb := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{URL: *testutils.MustParseURL("dns:///" + testEDSServcie)}})
65+
edsb := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{URL: *testutils.MustParseURL("dns:///" + testEDSService)}})
6766
if edsb == nil {
6867
t.Fatalf("builder.Build(%s) failed and returned nil", Name)
6968
}

‎xds/internal/balancer/clusterresolver/resource_resolver_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ func (s) TestResourceResolverOneEDSResource(t *testing.T) {
6060
}{
6161
{name: "watch EDS",
6262
clusterName: testClusterName,
63-
edsName: testEDSServcie,
64-
wantName: testEDSServcie,
63+
edsName: testEDSService,
64+
wantName: testEDSService,
6565
edsUpdate: testEDSUpdates[0],
6666
want: []priorityConfig{{
6767
mechanism: DiscoveryMechanism{
6868
Type: DiscoveryMechanismTypeEDS,
6969
Cluster: testClusterName,
70-
EDSServiceName: testEDSServcie,
70+
EDSServiceName: testEDSService,
7171
},
7272
edsResp: testEDSUpdates[0],
7373
childNameGen: newNameGenerator(0),
@@ -123,7 +123,7 @@ func (s) TestResourceResolverOneEDSResource(t *testing.T) {
123123
t.Fatalf("xdsClient.CancelCDS failed with error: %v", err)
124124
}
125125
if edsNameCanceled != test.wantName {
126-
t.Fatalf("xdsClient.CancelEDS called for %v, want: %v", edsNameCanceled, testEDSServcie)
126+
t.Fatalf("xdsClient.CancelEDS called for %v, want: %v", edsNameCanceled, testEDSService)
127127
}
128128
})
129129
}
@@ -225,16 +225,16 @@ func (s) TestResourceResolverChangeEDSName(t *testing.T) {
225225
rr.updateMechanisms([]DiscoveryMechanism{{
226226
Type: DiscoveryMechanismTypeEDS,
227227
Cluster: testClusterName,
228-
EDSServiceName: testEDSServcie,
228+
EDSServiceName: testEDSService,
229229
}})
230230
ctx, ctxCancel := context.WithTimeout(context.Background(), defaultTestTimeout)
231231
defer ctxCancel()
232232
gotEDSName1, err := fakeClient.WaitForWatchEDS(ctx)
233233
if err != nil {
234234
t.Fatalf("xdsClient.WatchCDS failed with error: %v", err)
235235
}
236-
if gotEDSName1 != testEDSServcie {
237-
t.Fatalf("xdsClient.WatchEDS called for cluster: %v, want: %v", gotEDSName1, testEDSServcie)
236+
if gotEDSName1 != testEDSService {
237+
t.Fatalf("xdsClient.WatchEDS called for cluster: %v, want: %v", gotEDSName1, testEDSService)
238238
}
239239

240240
// Invoke callback, should get an update.
@@ -245,7 +245,7 @@ func (s) TestResourceResolverChangeEDSName(t *testing.T) {
245245
mechanism: DiscoveryMechanism{
246246
Type: DiscoveryMechanismTypeEDS,
247247
Cluster: testClusterName,
248-
EDSServiceName: testEDSServcie,
248+
EDSServiceName: testEDSService,
249249
},
250250
edsResp: testEDSUpdates[0],
251251
childNameGen: newNameGenerator(0),
@@ -266,7 +266,7 @@ func (s) TestResourceResolverChangeEDSName(t *testing.T) {
266266
t.Fatalf("xdsClient.CancelCDS failed with error: %v", err)
267267
}
268268
if edsNameCanceled1 != gotEDSName1 {
269-
t.Fatalf("xdsClient.CancelEDS called for %v, want: %v", edsNameCanceled1, testEDSServcie)
269+
t.Fatalf("xdsClient.CancelEDS called for %v, want: %v", edsNameCanceled1, testEDSService)
270270
}
271271
gotEDSName2, err := fakeClient.WaitForWatchEDS(ctx)
272272
if err != nil {

0 commit comments

Comments
 (0)