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

internal: fix errors after merging (#3643)

Browse Source
This commit is contained in:
Menghan Li
2020-05-26 17:59:18 -07:00
committed by GitHub
parent eb827fbfd8
commit 5cd45224f8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xds/internal/client/client_watchers_service_test.go
View File

@ -359,7 +359,7 @@ func (s) TestServiceNotCancelRDSOnSameLDSUpdate(t *testing.T) {
serviceUpdateCh.Send(serviceUpdateErr{u: update, err: err}) serviceUpdateCh.Send(serviceUpdateErr{u: update, err: err})
}) })
wantUpdate := ServiceUpdate{Cluster: testCDSName} wantUpdate := ServiceUpdate{WeightedCluster: map[string]uint32{testCDSName: 1}}
<-v2Client.addWatches[ldsURL] <-v2Client.addWatches[ldsURL]
v2Client.r.newLDSUpdate(map[string]ldsUpdate{ v2Client.r.newLDSUpdate(map[string]ldsUpdate{
@ -367,10 +367,10 @@ func (s) TestServiceNotCancelRDSOnSameLDSUpdate(t *testing.T) {
}) })
<-v2Client.addWatches[rdsURL] <-v2Client.addWatches[rdsURL]
v2Client.r.newRDSUpdate(map[string]rdsUpdate{ v2Client.r.newRDSUpdate(map[string]rdsUpdate{
testRDSName: {clusterName: testCDSName}, testRDSName: {weightedCluster: map[string]uint32{testCDSName: 1}},
}) })
if u, err := serviceUpdateCh.Receive(); err != nil || u != (serviceUpdateErr{wantUpdate, nil}) { if u, err := serviceUpdateCh.Receive(); err != nil || !cmp.Equal(u, serviceUpdateErr{wantUpdate, nil}, cmp.AllowUnexported(serviceUpdateErr{})) {
t.Errorf("unexpected serviceUpdate: %v, error receiving from channel: %v", u, err) t.Errorf("unexpected serviceUpdate: %v, error receiving from channel: %v", u, err)
} }