aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/end2end/test_service_impl.cc
diff options
context:
space:
mode:
authorGravatar yang-g <yangg@google.com>2016-02-02 16:05:21 -0800
committerGravatar yang-g <yangg@google.com>2016-02-02 16:05:21 -0800
commit7b0edbd1a383d4044b1c3c1a7faab29bbaf7351c (patch)
tree9517db90e8b2b300604c32c8d83fa7d2c1cf019f /test/cpp/end2end/test_service_impl.cc
parentac1ac3ab3db628f7643532b515f62d113dcb9700 (diff)
remove the old impl caused by 4921
Diffstat (limited to 'test/cpp/end2end/test_service_impl.cc')
-rw-r--r--test/cpp/end2end/test_service_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc
index c9a32ecf5a..0eebe64148 100644
--- a/test/cpp/end2end/test_service_impl.cc
+++ b/test/cpp/end2end/test_service_impl.cc
@@ -106,7 +106,8 @@ Status TestServiceImpl::Echo(ServerContext* context, const EchoRequest* request,
gpr_time_from_micros(request->param().server_cancel_after_us(),
GPR_TIMESPAN)));
return Status::CANCELLED;
- } else {
+ } else if (!request->has_param() ||
+ !request->param().skip_cancelled_check()) {
EXPECT_FALSE(context->IsCancelled());
}