diff options
author | 2017-01-27 06:52:13 -0800 | |
---|---|---|
committer | 2017-01-27 06:52:13 -0800 | |
commit | 68bb6a845344eddbc045094567a948a8fdda9fe7 (patch) | |
tree | cd5b04d0354b1a324729e3eb2bae97af9e23f600 /test/cpp | |
parent | 1812cb87e225fff8d22d069b9487b39382baac1c (diff) | |
parent | eb30fd1df5a474d63d4a4f9262cd8fe87fd19868 (diff) |
Merge github.com:grpc/grpc into rollfwd
Diffstat (limited to 'test/cpp')
-rw-r--r-- | test/cpp/end2end/end2end_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index d2c7edc64b..47e5c5bd77 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -901,6 +901,8 @@ TEST_P(End2endTest, RpcMaxMessageSize) { EchoRequest request; EchoResponse response; request.set_message(string(kMaxMessageSize_ * 2, 'a')); + // cancelled is not guaranteed to appear before the end of the service handler + request.mutable_param()->set_skip_cancelled_check(true); ClientContext context; Status s = stub_->Echo(&context, request, &response); |