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

add test

Browse Source
This commit is contained in:
iamqizhao
2016-01-27 18:34:24 -08:00
parent 086f6de8a8
commit 6d87263bd5
2 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stream.go
View File

@ -113,7 +113,7 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
callHdr := &transport.CallHdr{ callHdr := &transport.CallHdr{
Host: cc.authority, Host: cc.authority,
Method: method, Method: method,
Flush: desc.ServerStreams, Flush: desc.ServerStreams&&desc.ClientStreams,
} }
if cp != nil { if cp != nil {
callHdr.SendCompress = cp.Type() callHdr.SendCompress = cp.Type()

70
test/end2end_test.go
View File

@ -327,7 +327,7 @@ func listTestEnv() []env {
return []env{{"tcp", nil, ""}, {"tcp", nil, "tls"}, {"unix", unixDialer, ""}, {"unix", unixDialer, "tls"}} return []env{{"tcp", nil, ""}, {"tcp", nil, "tls"}, {"unix", unixDialer, ""}, {"unix", unixDialer, "tls"}}
} }
func serverSetUp(t *testing.T, hs *health.HealthServer, maxStream uint32, cg grpc.CompressorGenerator, dg grpc.DecompressorGenerator, e env) (s *grpc.Server, addr string) { func serverSetUp(t *testing.T, servON bool, hs *health.HealthServer, maxStream uint32, cg grpc.CompressorGenerator, dg grpc.DecompressorGenerator, e env) (s *grpc.Server, addr string) {
sopts := []grpc.ServerOption{grpc.MaxConcurrentStreams(maxStream), grpc.CompressON(cg), grpc.DecompressON(dg)} sopts := []grpc.ServerOption{grpc.MaxConcurrentStreams(maxStream), grpc.CompressON(cg), grpc.DecompressON(dg)}
la := ":0" la := ":0"
switch e.network { switch e.network {
@ -350,7 +350,9 @@ func serverSetUp(t *testing.T, hs *health.HealthServer, maxStream uint32, cg grp
if hs != nil { if hs != nil {
healthpb.RegisterHealthServer(s, hs) healthpb.RegisterHealthServer(s, hs)
} }
testpb.RegisterTestServiceServer(s, &testServer{security: e.security}) if servON {
testpb.RegisterTestServiceServer(s, &testServer{security: e.security})
}
go s.Serve(lis) go s.Serve(lis)
addr = la addr = la
switch e.network { switch e.network {
@ -394,7 +396,7 @@ func TestTimeoutOnDeadServer(t *testing.T) {
} }
func testTimeoutOnDeadServer(t *testing.T, e env) { func testTimeoutOnDeadServer(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
ctx, _ := context.WithTimeout(context.Background(), time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Second)
@ -448,7 +450,7 @@ func TestHealthCheckOnSuccess(t *testing.T) {
func testHealthCheckOnSuccess(t *testing.T, e env) { func testHealthCheckOnSuccess(t *testing.T, e env) {
hs := health.NewHealthServer() hs := health.NewHealthServer()
hs.SetServingStatus("grpc.health.v1alpha.Health", 1) hs.SetServingStatus("grpc.health.v1alpha.Health", 1)
s, addr := serverSetUp(t, hs, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, hs, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
defer tearDown(s, cc) defer tearDown(s, cc)
if _, err := healthCheck(1*time.Second, cc, "grpc.health.v1alpha.Health"); err != nil { if _, err := healthCheck(1*time.Second, cc, "grpc.health.v1alpha.Health"); err != nil {
@ -465,7 +467,7 @@ func TestHealthCheckOnFailure(t *testing.T) {
func testHealthCheckOnFailure(t *testing.T, e env) { func testHealthCheckOnFailure(t *testing.T, e env) {
hs := health.NewHealthServer() hs := health.NewHealthServer()
hs.SetServingStatus("grpc.health.v1alpha.HealthCheck", 1) hs.SetServingStatus("grpc.health.v1alpha.HealthCheck", 1)
s, addr := serverSetUp(t, hs, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, hs, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
defer tearDown(s, cc) defer tearDown(s, cc)
if _, err := healthCheck(0*time.Second, cc, "grpc.health.v1alpha.Health"); err != grpc.Errorf(codes.DeadlineExceeded, "context deadline exceeded") { if _, err := healthCheck(0*time.Second, cc, "grpc.health.v1alpha.Health"); err != grpc.Errorf(codes.DeadlineExceeded, "context deadline exceeded") {
@ -480,7 +482,7 @@ func TestHealthCheckOff(t *testing.T) {
} }
func testHealthCheckOff(t *testing.T, e env) { func testHealthCheckOff(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
defer tearDown(s, cc) defer tearDown(s, cc)
if _, err := healthCheck(1*time.Second, cc, ""); err != grpc.Errorf(codes.Unimplemented, "unknown service grpc.health.v1alpha.Health") { if _, err := healthCheck(1*time.Second, cc, ""); err != grpc.Errorf(codes.Unimplemented, "unknown service grpc.health.v1alpha.Health") {
@ -496,7 +498,7 @@ func TestHealthCheckServingStatus(t *testing.T) {
func testHealthCheckServingStatus(t *testing.T, e env) { func testHealthCheckServingStatus(t *testing.T, e env) {
hs := health.NewHealthServer() hs := health.NewHealthServer()
s, addr := serverSetUp(t, hs, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, hs, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
defer tearDown(s, cc) defer tearDown(s, cc)
out, err := healthCheck(1*time.Second, cc, "") out, err := healthCheck(1*time.Second, cc, "")
@ -535,7 +537,7 @@ func TestEmptyUnaryWithUserAgent(t *testing.T) {
} }
func testEmptyUnaryWithUserAgent(t *testing.T, e env) { func testEmptyUnaryWithUserAgent(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, testAppUA, e) cc := clientSetUp(t, addr, nil, nil, testAppUA, e)
// Wait until cc is connected. // Wait until cc is connected.
ctx, _ := context.WithTimeout(context.Background(), time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Second)
@ -579,7 +581,7 @@ func TestFailedEmptyUnary(t *testing.T) {
} }
func testFailedEmptyUnary(t *testing.T, e env) { func testFailedEmptyUnary(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -596,7 +598,7 @@ func TestLargeUnary(t *testing.T) {
} }
func testLargeUnary(t *testing.T, e env) { func testLargeUnary(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -631,7 +633,7 @@ func TestMetadataUnaryRPC(t *testing.T) {
} }
func testMetadataUnaryRPC(t *testing.T, e env) { func testMetadataUnaryRPC(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -697,7 +699,7 @@ func TestRetry(t *testing.T) {
// TODO(zhaoq): Refactor to make this clearer and add more cases to test racy // TODO(zhaoq): Refactor to make this clearer and add more cases to test racy
// and error-prone paths. // and error-prone paths.
func testRetry(t *testing.T, e env) { func testRetry(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -728,7 +730,7 @@ func TestRPCTimeout(t *testing.T) {
// TODO(zhaoq): Have a better test coverage of timeout and cancellation mechanism. // TODO(zhaoq): Have a better test coverage of timeout and cancellation mechanism.
func testRPCTimeout(t *testing.T, e env) { func testRPCTimeout(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -761,7 +763,7 @@ func TestCancel(t *testing.T) {
} }
func testCancel(t *testing.T, e env) { func testCancel(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -794,7 +796,7 @@ func TestCancelNoIO(t *testing.T) {
func testCancelNoIO(t *testing.T, e env) { func testCancelNoIO(t *testing.T, e env) {
// Only allows 1 live stream per server transport. // Only allows 1 live stream per server transport.
s, addr := serverSetUp(t, nil, 1, nil, nil, e) s, addr := serverSetUp(t, true, nil, 1, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -839,6 +841,28 @@ var (
respSizes = []int{31415, 9, 2653, 58979} respSizes = []int{31415, 9, 2653, 58979}
) )
func TestNoService(t *testing.T) {
for _, e := range listTestEnv() {
testNoService(t, e)
}
}
func testNoService(t *testing.T, e env) {
s, addr := serverSetUp(t, false, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc)
// Make sure setting ack has been sent.
time.Sleep(2*time.Second)
stream, err := tc.FullDuplexCall(context.Background())
if err != nil {
t.Fatalf("%v.FullDuplexCall(_) = _, %v, want <nil>", tc, err)
}
if _, err := stream.Recv(); grpc.Code(err) != codes.Unimplemented {
t.Fatalf("stream.Recv() = _, %v, want _, error code %d", err, codes.Unimplemented)
}
}
func TestPingPong(t *testing.T) { func TestPingPong(t *testing.T) {
for _, e := range listTestEnv() { for _, e := range listTestEnv() {
testPingPong(t, e) testPingPong(t, e)
@ -846,7 +870,7 @@ func TestPingPong(t *testing.T) {
} }
func testPingPong(t *testing.T, e env) { func testPingPong(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -904,7 +928,7 @@ func TestMetadataStreamingRPC(t *testing.T) {
} }
func testMetadataStreamingRPC(t *testing.T, e env) { func testMetadataStreamingRPC(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -971,7 +995,7 @@ func TestServerStreaming(t *testing.T) {
} }
func testServerStreaming(t *testing.T, e env) { func testServerStreaming(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -1024,7 +1048,7 @@ func TestFailedServerStreaming(t *testing.T) {
} }
func testFailedServerStreaming(t *testing.T, e env) { func testFailedServerStreaming(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -1055,7 +1079,7 @@ func TestClientStreaming(t *testing.T) {
} }
func testClientStreaming(t *testing.T, e env) { func testClientStreaming(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -1096,7 +1120,7 @@ func TestExceedMaxStreamsLimit(t *testing.T) {
func testExceedMaxStreamsLimit(t *testing.T, e env) { func testExceedMaxStreamsLimit(t *testing.T, e env) {
// Only allows 1 live stream per server transport. // Only allows 1 live stream per server transport.
s, addr := serverSetUp(t, nil, 1, nil, nil, e) s, addr := serverSetUp(t, true, nil, 1, nil, nil, e)
cc := clientSetUp(t, addr, nil, nil, "", e) cc := clientSetUp(t, addr, nil, nil, "", e)
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc) defer tearDown(s, cc)
@ -1126,7 +1150,7 @@ func TestCompressServerHasNoSupport(t *testing.T) {
} }
func testCompressServerHasNoSupport(t *testing.T, e env) { func testCompressServerHasNoSupport(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, nil, nil, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, nil, nil, e)
cc := clientSetUp(t, addr, grpc.NewGZIPCompressor, nil, "", e) cc := clientSetUp(t, addr, grpc.NewGZIPCompressor, nil, "", e)
// Unary call // Unary call
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)
@ -1179,7 +1203,7 @@ func TestCompressOK(t *testing.T) {
} }
func testCompressOK(t *testing.T, e env) { func testCompressOK(t *testing.T, e env) {
s, addr := serverSetUp(t, nil, math.MaxUint32, grpc.NewGZIPCompressor, grpc.NewGZIPDecompressor, e) s, addr := serverSetUp(t, true, nil, math.MaxUint32, grpc.NewGZIPCompressor, grpc.NewGZIPDecompressor, e)
cc := clientSetUp(t, addr, grpc.NewGZIPCompressor, grpc.NewGZIPDecompressor, "", e) cc := clientSetUp(t, addr, grpc.NewGZIPCompressor, grpc.NewGZIPDecompressor, "", e)
// Unary call // Unary call
tc := testpb.NewTestServiceClient(cc) tc := testpb.NewTestServiceClient(cc)