diff --git a/xds/internal/testutils/local_listener.go b/internal/testutils/local_listener.go similarity index 100% rename from xds/internal/testutils/local_listener.go rename to internal/testutils/local_listener.go diff --git a/xds/csds/csds_test.go b/xds/csds/csds_test.go index ed1088b43..88df77a62 100644 --- a/xds/csds/csds_test.go +++ b/xds/csds/csds_test.go @@ -33,7 +33,6 @@ import ( "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/xds" _ "google.golang.org/grpc/xds/internal/httpfilter/router" - xtestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/testutils/e2e" "google.golang.org/grpc/xds/internal/xdsclient" "google.golang.org/protobuf/testing/protocmp" @@ -258,9 +257,9 @@ func commonSetup(ctx context.Context, t *testing.T) (xdsclient.XDSClient, *e2e.M } v3statuspbgrpc.RegisterClientStatusDiscoveryServiceServer(server, csdss) // Create a local listener and pass it to Serve(). - lis, err := xtestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xtestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } go func() { if err := server.Serve(lis); err != nil { @@ -504,9 +503,9 @@ func TestCSDSNoXDSClient(t *testing.T) { defer csdss.Close() v3statuspbgrpc.RegisterClientStatusDiscoveryServiceServer(server, csdss) // Create a local listener and pass it to Serve(). - lis, err := xtestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xtestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } go func() { if err := server.Serve(lis); err != nil { diff --git a/xds/internal/httpfilter/fault/fault_test.go b/xds/internal/httpfilter/fault/fault_test.go index c2959054d..1bad1f92d 100644 --- a/xds/internal/httpfilter/fault/fault_test.go +++ b/xds/internal/httpfilter/fault/fault_test.go @@ -42,7 +42,6 @@ import ( "google.golang.org/grpc/internal/xds" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - xtestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/testutils/e2e" "google.golang.org/protobuf/types/known/wrapperspb" @@ -122,9 +121,9 @@ func clientSetup(t *testing.T) (*e2e.ManagementServer, string, uint32, func()) { testpb.RegisterTestServiceServer(server, &testService{}) // Create a local listener and pass it to Serve(). - lis, err := xtestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xtestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } go func() { diff --git a/xds/internal/test/xds_client_integration_test.go b/xds/internal/test/xds_client_integration_test.go index 23ea15469..e26e3e08f 100644 --- a/xds/internal/test/xds_client_integration_test.go +++ b/xds/internal/test/xds_client_integration_test.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/internal/stubserver" + "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/internal/xds/env" "google.golang.org/grpc/status" - "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/testutils/e2e" v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" diff --git a/xds/internal/test/xds_server_integration_test.go b/xds/internal/test/xds_server_integration_test.go index 707a9605d..6641a678d 100644 --- a/xds/internal/test/xds_server_integration_test.go +++ b/xds/internal/test/xds_server_integration_test.go @@ -52,7 +52,6 @@ import ( wrapperspb "github.com/golang/protobuf/ptypes/wrappers" xdscreds "google.golang.org/grpc/credentials/xds" testpb "google.golang.org/grpc/test/grpc_testing" - xdstestutils "google.golang.org/grpc/xds/internal/testutils" ) const ( @@ -86,7 +85,7 @@ func setupGRPCServer(t *testing.T, bootstrapContents []byte) (net.Listener, func testpb.RegisterTestServiceServer(server, &testService{}) // Create a local listener and pass it to Serve(). - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } diff --git a/xds/internal/test/xds_server_serving_mode_test.go b/xds/internal/test/xds_server_serving_mode_test.go index ac4b3929c..5fa17546e 100644 --- a/xds/internal/test/xds_server_serving_mode_test.go +++ b/xds/internal/test/xds_server_serving_mode_test.go @@ -29,15 +29,16 @@ import ( "testing" "time" - v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials/insecure" xdscreds "google.golang.org/grpc/credentials/xds" - testpb "google.golang.org/grpc/test/grpc_testing" + "google.golang.org/grpc/internal/testutils" "google.golang.org/grpc/xds" - xdstestutils "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/testutils/e2e" + + v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" + testpb "google.golang.org/grpc/test/grpc_testing" ) // TestServerSideXDS_RedundantUpdateSuppression tests the scenario where the @@ -52,7 +53,7 @@ func (s) TestServerSideXDS_RedundantUpdateSuppression(t *testing.T) { if err != nil { t.Fatal(err) } - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } @@ -168,11 +169,11 @@ func (s) TestServerSideXDS_ServingModeChanges(t *testing.T) { } // Create two local listeners and pass it to Serve(). - lis1, err := xdstestutils.LocalTCPListener() + lis1, err := testutils.LocalTCPListener() if err != nil { t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } - lis2, err := xdstestutils.LocalTCPListener() + lis2, err := testutils.LocalTCPListener() if err != nil { t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } diff --git a/xds/server_test.go b/xds/server_test.go index 0866e0414..63cb6878e 100644 --- a/xds/server_test.go +++ b/xds/server_test.go @@ -28,12 +28,6 @@ import ( "testing" "time" - v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" - v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" - v3httppb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" - v3tlspb "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" - wrapperspb "github.com/golang/protobuf/ptypes/wrappers" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials/insecure" @@ -47,6 +41,13 @@ import ( "google.golang.org/grpc/xds/internal/testutils/fakeclient" "google.golang.org/grpc/xds/internal/xdsclient" "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + + v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" + v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" + v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" + v3httppb "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" + v3tlspb "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" + wrapperspb "github.com/golang/protobuf/ptypes/wrappers" ) const ( @@ -389,9 +390,9 @@ func (s) TestServeSuccess(t *testing.T) { server := NewGRPCServer(modeChangeOption) defer server.Stop() - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xdstestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } // Call Serve() in a goroutine, and push on a channel when Serve returns. @@ -506,9 +507,9 @@ func (s) TestServeWithStop(t *testing.T) { // it after the LDS watch has been registered. server := NewGRPCServer() - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xdstestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } // Call Serve() in a goroutine, and push on a channel when Serve returns. @@ -565,9 +566,9 @@ func (s) TestServeBootstrapFailure(t *testing.T) { server := NewGRPCServer() defer server.Stop() - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xdstestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } serveDone := testutils.NewChannel() @@ -636,9 +637,9 @@ func (s) TestServeBootstrapConfigInvalid(t *testing.T) { server := NewGRPCServer(grpc.Creds(xdsCreds)) defer server.Stop() - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xdstestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } serveDone := testutils.NewChannel() @@ -672,9 +673,9 @@ func (s) TestServeNewClientFailure(t *testing.T) { server := NewGRPCServer() defer server.Stop() - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xdstestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } serveDone := testutils.NewChannel() @@ -704,9 +705,9 @@ func (s) TestHandleListenerUpdate_NoXDSCreds(t *testing.T) { server := NewGRPCServer() defer server.Stop() - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xdstestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } // Call Serve() in a goroutine, and push on a channel when Serve returns. @@ -818,9 +819,9 @@ func (s) TestHandleListenerUpdate_ErrorUpdate(t *testing.T) { server := NewGRPCServer(grpc.Creds(xdsCreds)) defer server.Stop() - lis, err := xdstestutils.LocalTCPListener() + lis, err := testutils.LocalTCPListener() if err != nil { - t.Fatalf("xdstestutils.LocalTCPListener() failed: %v", err) + t.Fatalf("testutils.LocalTCPListener() failed: %v", err) } // Call Serve() in a goroutine, and push on a channel when Serve returns.