Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup: switching to stubserver in tests instead of testservice implementation #7708

Merged
merged 17 commits into from
Oct 28, 2024
Merged

cleanup: switching to stubserver in tests instead of testservice implementation #7708

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4c0a321
Removing testservice impl and using stubserver support for RPC calls
janardhankrishna-sai Oct 8, 2024
9e741a6
Removing testservice impl and using stubserver support for RPC calls
janardhankrishna-sai Oct 8, 2024
2e3e591
revert test
janardhankrishna-sai Oct 8, 2024
0b5b9f7
Adding stubserver impl to TestE2E_CustomBackendMetrics_OutOfBand
janardhankrishna-sai Oct 8, 2024
cd70477
Updating test
janardhankrishna-sai Oct 8, 2024
29da18f
reverting numRequests type conversion
janardhankrishna-sai Oct 10, 2024
8e937ad
reverting stubserver updates on xds and orca directories
janardhankrishna-sai Oct 10, 2024
ab3f26e
Moving server.stop() to up
janardhankrishna-sai Oct 16, 2024
b4077d5
Updating the comments
janardhankrishna-sai Oct 18, 2024
ee9857e
Updating the comments
janardhankrishna-sai Oct 18, 2024
ca55513
Updating the comments
janardhankrishna-sai Oct 18, 2024
7c5f1d8
reverting empty line
janardhankrishna-sai Oct 18, 2024
2bb94e4
re-trigger
janardhankrishna-sai Oct 19, 2024
fda79a8
updating comments
janardhankrishna-sai Oct 24, 2024
86c3271
Updating comments
janardhankrishna-sai Oct 24, 2024
5cd4830
updating the comments
janardhankrishna-sai Oct 24, 2024
dbcdf4d
re-trigger
janardhankrishna-sai Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion test/xds/xds_client_ignore_resource_deletion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,24 @@ func setupGRPCServerWithModeChangeChannelAndServe(t *testing.T, bootstrapContent
t.Logf("Serving mode for listener %q changed to %q, err: %v", addr.String(), args.Mode, args.Err)
updateCh <- args.Mode
})

stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
UnaryCallF: func(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
return &testpb.SimpleResponse{}, nil
},
}
server, err := xds.NewGRPCServer(grpc.Creds(insecure.NewCredentials()), modeChangeOpt, xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
t.Cleanup(server.Stop)
testgrpc.RegisterTestServiceServer(server, &testService{})

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

// Serve.
go func() {
Expand Down
20 changes: 16 additions & 4 deletions test/xds/xds_server_certificate_providers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"
xdscreds "google.golang.org/grpc/credentials/xds"
"google.golang.org/grpc/internal/stubserver"
"google.golang.org/grpc/internal/testutils"
"google.golang.org/grpc/internal/testutils/xds/e2e"
"google.golang.org/grpc/internal/testutils/xds/e2e/setup"
Expand Down Expand Up @@ -161,9 +162,12 @@ func (s) TestServerSideXDS_WithNoCertificateProvidersInBootstrap_Failure(t *test
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
testgrpc.RegisterTestServiceServer(server, &testService{})
defer server.Stop()

stub := &stubserver.StubServer{}
stub.S = server
stubserver.StartTestService(t, stub)

// Create a local listener and pass it to Serve().
lis, err := testutils.LocalTCPListener()
if err != nil {
Expand Down Expand Up @@ -269,8 +273,8 @@ func (s) TestServerSideXDS_WithValidAndInvalidSecurityConfiguration(t *testing.T
}

// Create an xDS-enabled grpc server that is configured to use xDS
// credentials, and register the test service on it. Configure a mode change
purnesh42H marked this conversation as resolved.
Show resolved Hide resolved
// option that closes a channel when listener2 enter serving mode.
// credentials, and configure a mode change option that closes a channel
// when listener2 enters serving mode.
creds, err := xdscreds.NewServerCredentials(xdscreds.ServerOptions{FallbackCreds: insecure.NewCredentials()})
if err != nil {
t.Fatal(err)
Expand All @@ -283,13 +287,21 @@ func (s) TestServerSideXDS_WithValidAndInvalidSecurityConfiguration(t *testing.T
}
}
})
stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
}
server, err := xds.NewGRPCServer(grpc.Creds(creds), modeChangeOpt, xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
testgrpc.RegisterTestServiceServer(server, &testService{})
defer server.Stop()

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

go func() {
if err := server.Serve(lis1); err != nil {
t.Errorf("Serve() failed: %v", err)
Expand Down
46 changes: 22 additions & 24 deletions test/xds/xds_server_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
xdscreds "google.golang.org/grpc/credentials/xds"
"google.golang.org/grpc/internal"
"google.golang.org/grpc/internal/grpcsync"
"google.golang.org/grpc/internal/stubserver"
"google.golang.org/grpc/internal/testutils"
"google.golang.org/grpc/internal/testutils/xds/e2e"
"google.golang.org/grpc/internal/testutils/xds/e2e/setup"
Expand All @@ -45,27 +46,6 @@ import (
testpb "google.golang.org/grpc/interop/grpc_testing"
)

type testService struct {
testgrpc.TestServiceServer
}

func (*testService) EmptyCall(context.Context, *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
}

func (*testService) UnaryCall(context.Context, *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
return &testpb.SimpleResponse{}, nil
}

func (*testService) FullDuplexCall(stream testgrpc.TestService_FullDuplexCallServer) error {
for {
_, err := stream.Recv() // hangs here forever if stream doesn't shut down...doesn't receive EOF without any errors
if err == io.EOF {
return nil
}
}
}

func testModeChangeServerOption(t *testing.T) grpc.ServerOption {
// Create a server option to get notified about serving mode changes. We don't
// do anything other than throwing a log entry here. But this is required,
Expand Down Expand Up @@ -111,13 +91,31 @@ func setupGRPCServer(t *testing.T, bootstrapContents []byte) (net.Listener, func
if err != nil {
t.Fatal(err)
}

// Initialize an xDS-enabled gRPC server and register the stubServer on it.
stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
UnaryCallF: func(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
return &testpb.SimpleResponse{}, nil
},
FullDuplexCallF: func(stream testgrpc.TestService_FullDuplexCallServer) error {
for {
_, err := stream.Recv() // hangs here forever if stream doesn't shut down...doesn't receive EOF without any errors
if err == io.EOF {
return nil
}
}
},
}
// Initialize an xDS-enabled gRPC server and use the helper to start the test service.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment here. Just modify the existing statement instead of writing a new line

server, err := xds.NewGRPCServer(grpc.Creds(creds), testModeChangeServerOption(t), xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
testgrpc.RegisterTestServiceServer(server, &testService{})

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

// Create a local listener and pass it to Serve().
lis, err := testutils.LocalTCPListener()
Expand Down
25 changes: 21 additions & 4 deletions test/xds/xds_server_serving_mode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"
xdscreds "google.golang.org/grpc/credentials/xds"
"google.golang.org/grpc/internal/stubserver"
"google.golang.org/grpc/internal/testutils"
"google.golang.org/grpc/internal/testutils/xds/e2e"
"google.golang.org/grpc/internal/testutils/xds/e2e/setup"
Expand Down Expand Up @@ -62,13 +63,21 @@ func (s) TestServerSideXDS_RedundantUpdateSuppression(t *testing.T) {
updateCh <- args.Mode
})

// Initialize an xDS-enabled gRPC server and register the stubServer on it.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
}

server, err := xds.NewGRPCServer(grpc.Creds(creds), modeChangeOpt, xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
defer server.Stop()
testgrpc.RegisterTestServiceServer(server, &testService{})

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

// Setup the management server to respond with the listener resources.
host, port, err := hostPortFromListener(lis)
Expand Down Expand Up @@ -206,13 +215,21 @@ func (s) TestServerSideXDS_ServingModeChanges(t *testing.T) {
}
})

// Initialize an xDS-enabled gRPC server and register the stubServer on it.
purnesh42H marked this conversation as resolved.
Show resolved Hide resolved
stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
}

server, err := xds.NewGRPCServer(grpc.Creds(creds), modeChangeOpt, xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
defer server.Stop()
testgrpc.RegisterTestServiceServer(server, &testService{})

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

// Setup the management server to respond with server-side Listener
// resources for both listeners.
Expand Down
42 changes: 39 additions & 3 deletions test/xds/xds_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/internal/grpcsync"
"google.golang.org/grpc/internal/stubserver"
"google.golang.org/grpc/internal/testutils"
"google.golang.org/grpc/internal/testutils/xds/e2e"
"google.golang.org/grpc/internal/testutils/xds/e2e/setup"
Expand Down Expand Up @@ -93,12 +94,21 @@ func (s) TestServeLDSRDS(t *testing.T) {
}
})

stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
}
server, err := xds.NewGRPCServer(grpc.Creds(insecure.NewCredentials()), modeChangeOpt, xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
defer server.Stop()
testgrpc.RegisterTestServiceServer(server, &testService{})

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

go func() {
if err := server.Serve(lis); err != nil {
t.Errorf("Serve() failed: %v", err)
Expand Down Expand Up @@ -201,12 +211,21 @@ func (s) TestRDSNack(t *testing.T) {
}
})

stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
}
server, err := xds.NewGRPCServer(grpc.Creds(insecure.NewCredentials()), modeChangeOpt, xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
defer server.Stop()
testgrpc.RegisterTestServiceServer(server, &testService{})

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

go func() {
if err := server.Serve(lis); err != nil {
t.Errorf("Serve() failed: %v", err)
Expand Down Expand Up @@ -259,12 +278,29 @@ func (s) TestMultipleUpdatesImmediatelySwitch(t *testing.T) {
if err := managementServer.Update(ctx, resources); err != nil {
t.Fatal(err)
}
stub := &stubserver.StubServer{
EmptyCallF: func(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
return &testpb.Empty{}, nil
},
FullDuplexCallF: func(stream testgrpc.TestService_FullDuplexCallServer) error {
for {
_, err := stream.Recv() // hangs here forever if stream doesn't shut down...doesn't receive EOF without any errors
if err == io.EOF {
return nil
}
}
},
}
server, err := xds.NewGRPCServer(grpc.Creds(insecure.NewCredentials()), testModeChangeServerOption(t), xds.BootstrapContentsForTesting(bootstrapContents))
if err != nil {
t.Fatalf("Failed to create an xDS enabled gRPC server: %v", err)
}
defer server.Stop()
testgrpc.RegisterTestServiceServer(server, &testService{})

// Set the server in the stub and start the test service.
stub.S = server
stubserver.StartTestService(t, stub)

go func() {
if err := server.Serve(lis); err != nil {
t.Errorf("Serve() failed: %v", err)
Expand Down