aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/end2end
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2016-02-22 23:15:28 -0800
committerGravatar David Garcia Quintas <dgq@google.com>2016-02-22 23:15:28 -0800
commit45add8a445d426959634e172f195c57c56c4ca3d (patch)
treeeef39567b46b94ae21723961c8ff1980db88dbaf /test/cpp/end2end
parent0160873273be3fb502f05d4349e074422f4addcb (diff)
parent27b3f776da80da9d74e9c6a43d6794c86ba0cfb3 (diff)
Merge branch 'master' of github.com:grpc/grpc into alarm_cpp
Diffstat (limited to 'test/cpp/end2end')
-rw-r--r--test/cpp/end2end/async_end2end_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc
index a15cbd7ee2..9ca3bf98f8 100644
--- a/test/cpp/end2end/async_end2end_test.cc
+++ b/test/cpp/end2end/async_end2end_test.cc
@@ -989,6 +989,10 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest {
if (server_try_cancel == CANCEL_AFTER_PROCESSING) {
ServerTryCancel(&srv_ctx);
+
+ // Client reads may fail bacause it is notified that the stream is
+ // cancelled.
+ ignore_cq_result = true;
}
// Client attemts to read the three messages from the server