Merge pull request #11545 from y-zeng/max_message_length

Fix max_message_length
8 years ago · cf8c67c00b
parent 045f9346ef 2768866320
commit cf8c67c00b
1 changed files with 5 additions and 5 deletions
--- a/test/core/end2end/tests/max_message_length.c
+++ b/test/core/end2end/tests/max_message_length.c
@ -68,11 +68,11 @@ static void drain_cq(grpc_completion_queue *cq) {

 static void shutdown_server(grpc_end2end_test_fixture *f) {
  if (!f->server) return;
-  grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000));
-  GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000),
-                                         grpc_timeout_seconds_to_deadline(5),
-                                         NULL)
-                 .type == GRPC_OP_COMPLETE);
+  grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000));
+  grpc_event ev = grpc_completion_queue_next(
+      f->cq, grpc_timeout_seconds_to_deadline(5), NULL);
+  GPR_ASSERT(ev.type == GRPC_OP_COMPLETE);
+  GPR_ASSERT(ev.tag == tag(1000));
  grpc_server_destroy(f->server);
  f->server = NULL;
 }