From 5cd45224f897e3d12e40aafbb4198c827fe47714 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Tue, 26 May 2020 17:59:18 -0700 Subject: [PATCH] internal: fix errors after merging (#3643) --- xds/internal/client/client_watchers_service_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xds/internal/client/client_watchers_service_test.go b/xds/internal/client/client_watchers_service_test.go index 91bb90b6..71de6c75 100644 --- a/xds/internal/client/client_watchers_service_test.go +++ b/xds/internal/client/client_watchers_service_test.go @@ -359,7 +359,7 @@ func (s) TestServiceNotCancelRDSOnSameLDSUpdate(t *testing.T) { serviceUpdateCh.Send(serviceUpdateErr{u: update, err: err}) }) - wantUpdate := ServiceUpdate{Cluster: testCDSName} + wantUpdate := ServiceUpdate{WeightedCluster: map[string]uint32{testCDSName: 1}} <-v2Client.addWatches[ldsURL] v2Client.r.newLDSUpdate(map[string]ldsUpdate{ @@ -367,10 +367,10 @@ func (s) TestServiceNotCancelRDSOnSameLDSUpdate(t *testing.T) { }) <-v2Client.addWatches[rdsURL] 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) }