zrpc timeout & unit tests (#573)

* zrpc timeout & unit tests
This commit is contained in:
Kevin Wan
2021-03-19 18:41:26 +08:00
committed by GitHub
parent 3c6951577d
commit 4884a7b3c6
4 changed files with 119 additions and 3 deletions

View File

@@ -18,6 +18,27 @@ func TimeoutInterceptor(timeout time.Duration) grpc.UnaryClientInterceptor {
ctx, cancel := contextx.ShrinkDeadline(ctx, timeout)
defer cancel()
return invoker(ctx, method, req, reply, cc, opts...)
done := make(chan error)
panicChan := make(chan interface{}, 1)
go func() {
defer func() {
if p := recover(); p != nil {
panicChan <- p
}
}()
done <- invoker(ctx, method, req, reply, cc, opts...)
close(done)
}()
select {
case p := <-panicChan:
panic(p)
case err := <-done:
return err
case <-ctx.Done():
return ctx.Err()
}
}
}

View File

@@ -48,3 +48,40 @@ func TestTimeoutInterceptor_timeout(t *testing.T) {
wg.Wait()
assert.Nil(t, err)
}
func TestTimeoutInterceptor_timeoutExpire(t *testing.T) {
const timeout = time.Millisecond * 10
interceptor := TimeoutInterceptor(timeout)
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond)
defer cancel()
var wg sync.WaitGroup
wg.Add(1)
cc := new(grpc.ClientConn)
err := interceptor(ctx, "/foo", nil, nil, cc,
func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn,
opts ...grpc.CallOption) error {
defer wg.Done()
time.Sleep(time.Millisecond * 50)
return nil
})
wg.Wait()
assert.Equal(t, context.DeadlineExceeded, err)
}
func TestTimeoutInterceptor_panic(t *testing.T) {
timeouts := []time.Duration{0, time.Millisecond * 10}
for _, timeout := range timeouts {
t.Run(strconv.FormatInt(int64(timeout), 10), func(t *testing.T) {
interceptor := TimeoutInterceptor(timeout)
cc := new(grpc.ClientConn)
assert.Panics(t, func() {
_ = interceptor(context.Background(), "/foo", nil, nil, cc,
func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn,
opts ...grpc.CallOption) error {
panic("any")
},
)
})
})
}
}