Don't check for client_idle since client_idle is disabled

pull/20910/head
Vijay Pai 5 years ago
parent 4444c0a3d5
commit 6352ca3682
  1. 10
      test/core/channel/channel_args_test.cc
  2. 4
      test/core/channel/minimal_stack_is_minimal_test.cc

@ -126,12 +126,12 @@ grpc_channel_args* mutate_channel_args(const char* target,
return new_args; return new_args;
} }
// Minimal stack should not have client_idle filter // Minimal stack should not have deadline filter
static bool channel_has_client_idle_filter(grpc_channel* c) { static bool channel_has_deadline_filter(grpc_channel* c) {
grpc_channel_stack* stack = grpc_channel_get_channel_stack(c); grpc_channel_stack* stack = grpc_channel_get_channel_stack(c);
for (size_t i = 0; i < stack->count; i++) { for (size_t i = 0; i < stack->count; i++) {
if (strcmp(grpc_channel_stack_element(stack, i)->filter->name, if (strcmp(grpc_channel_stack_element(stack, i)->filter->name,
"client_idle") == 0) { "deadline") == 0) {
return true; return true;
} }
} }
@ -157,12 +157,12 @@ static void test_channel_create_with_global_mutator(void) {
grpc_channel_args client_args = {GPR_ARRAY_SIZE(client_a), client_a}; grpc_channel_args client_args = {GPR_ARRAY_SIZE(client_a), client_a};
grpc_channel* c = grpc_channel* c =
grpc_insecure_channel_create("no_op_mutator", &client_args, nullptr); grpc_insecure_channel_create("no_op_mutator", &client_args, nullptr);
GPR_ASSERT(channel_has_client_idle_filter(c)); GPR_ASSERT(channel_has_deadline_filter(c));
grpc_channel_destroy(c); grpc_channel_destroy(c);
c = grpc_insecure_channel_create("minimal_stack_mutator", &client_args, c = grpc_insecure_channel_create("minimal_stack_mutator", &client_args,
nullptr); nullptr);
GPR_ASSERT(channel_has_client_idle_filter(c) == false); GPR_ASSERT(channel_has_deadline_filter(c) == false);
grpc_channel_destroy(c); grpc_channel_destroy(c);
gpr_free(fc); gpr_free(fc);

@ -100,8 +100,8 @@ int main(int argc, char** argv) {
errors += CHECK_STACK("chttp2", nullptr, GRPC_SERVER_CHANNEL, "server", errors += CHECK_STACK("chttp2", nullptr, GRPC_SERVER_CHANNEL, "server",
"message_size", "deadline", "http-server", "message_size", "deadline", "http-server",
"message_compress", "connected", NULL); "message_compress", "connected", NULL);
errors += CHECK_STACK(nullptr, nullptr, GRPC_CLIENT_CHANNEL, errors += CHECK_STACK(nullptr, nullptr, GRPC_CLIENT_CHANNEL, "client-channel",
"client_idle, client-channel", NULL); NULL);
GPR_ASSERT(errors == 0); GPR_ASSERT(errors == 0);
grpc_shutdown(); grpc_shutdown();

Loading…
Cancel
Save