merge conflicts

xds/internal/xdsclient/e2e_test/misc_watchers_test.go

@@ -20,11 +20,8 @@ package e2e_test
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
 	"google.golang.org/grpc/internal/testutils"
 	"google.golang.org/grpc/internal/testutils/xds/e2e"
 	"google.golang.org/grpc/xds/internal/xdsclient"
@@ -33,29 +30,6 @@ import (
 	v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 )
 
-// verifyRouteConfigUpdate waits for an update to be received on the provided
-// update channel and verifies that it matches the expected update.
-//
-// Returns an error if no update is received before the context deadline expires
-// or the received update does not match the expected one.
-func verifyRouteConfigUpdate(ctx context.Context, updateCh *testutils.Channel, wantUpdate xdsresource.RouteConfigUpdateErrTuple) error {
-	u, err := updateCh.Receive(ctx)
-	if err != nil {
-		return fmt.Errorf("timeout when waiting for a route configuration resource from the management server: %v", err)
-	}
-	got := u.(xdsresource.RouteConfigUpdateErrTuple)
-	if wantUpdate.Err != nil {
-		if gotType, wantType := xdsresource.ErrType(got.Err), xdsresource.ErrType(wantUpdate.Err); gotType != wantType {
-			return fmt.Errorf("received update with error type %v, want %v", gotType, wantType)
-		}
-	}
-	cmpOpts := []cmp.Option{cmpopts.EquateEmpty(), cmpopts.IgnoreFields(xdsresource.RouteConfigUpdate{}, "Raw")}
-	if diff := cmp.Diff(wantUpdate.Update, got.Update, cmpOpts...); diff != "" {
-		return fmt.Errorf("received unepected diff in the route configuration resource update: (-want, got):\n%s", diff)
-	}
-	return nil
-}
-
 // TestWatchCallAnotherWatch covers the case where watch() is called inline by a
 // callback. It makes sure it doesn't cause a deadlock.
 func (s) TestWatchCallAnotherWatch(t *testing.T) {
@@ -162,7 +136,3 @@ func (s) TestWatchCallAnotherWatch(t *testing.T) {
 	rdsCancel2()
 	rdsCancel3()
 }
-
-func newStringP(s string) *string {
-	return &s
-}