aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2018-12-07 12:20:45 -0800
committerGravatar GitHub <noreply@github.com>2018-12-07 12:20:45 -0800
commit09be5d095f0dc5bb797d322ce0262a9be45eb157 (patch)
tree7d09c207d2001ed8867dffe2d1472234b97b8be3 /test
parent60129747c9cfc652fcffeb509023b2fd1993249b (diff)
parent83c6640e926b3e623e4a290fd779bc7f70a90129 (diff)
Merge pull request #17443 from vjpai/allow_health
Server interceptor test should understand the health checking service
Diffstat (limited to 'test')
-rw-r--r--test/cpp/end2end/server_interceptors_end2end_test.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/cpp/end2end/server_interceptors_end2end_test.cc b/test/cpp/end2end/server_interceptors_end2end_test.cc
index 1e0e366870..9460a7d6c6 100644
--- a/test/cpp/end2end/server_interceptors_end2end_test.cc
+++ b/test/cpp/end2end/server_interceptors_end2end_test.cc
@@ -52,11 +52,13 @@ class LoggingInterceptor : public experimental::Interceptor {
experimental::ServerRpcInfo::Type type = info->type();
// Check that we use one of our standard methods with expected type.
+ // Also allow the health checking service.
// We accept BIDI_STREAMING for Echo in case it's an AsyncGenericService
// being tested (the GenericRpc test).
// The empty method is for the Unimplemented requests that arise
// when draining the CQ.
EXPECT_TRUE(
+ strstr(method, "/grpc.health") == method ||
(strcmp(method, "/grpc.testing.EchoTestService/Echo") == 0 &&
(type == experimental::ServerRpcInfo::Type::UNARY ||
type == experimental::ServerRpcInfo::Type::BIDI_STREAMING)) ||