diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-05-28 12:53:54 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-05-28 12:53:54 -0700 |
| commit | ba2e755701caddc1bd5b6b182b003b75483ce626 (patch) | |
| tree | 3e85606d68aa63211f34c0c54fe828bb4f23cc05 /test/core/end2end/tests/cancel_before_invoke.c | |
| parent | bf26c53b10d585840c8f142b4526ca5953d2d1f2 (diff) | |
| parent | 201035d4a6bc273856f182de816649630d29b684 (diff) | |
Merge branch 'you-complete-me' into we-dont-need-no-cv
Diffstat (limited to 'test/core/end2end/tests/cancel_before_invoke.c')
| -rw-r--r-- | test/core/end2end/tests/cancel_before_invoke.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/core/end2end/tests/cancel_before_invoke.c b/test/core/end2end/tests/cancel_before_invoke.c index a2935ac122..7455c1cb3d 100644 --- a/test/core/end2end/tests/cancel_before_invoke.c +++ b/test/core/end2end/tests/cancel_before_invoke.c @@ -74,7 +74,8 @@ static void drain_cq(grpc_completion_queue *cq) { static void shutdown_server(grpc_end2end_test_fixture *f) { if (!f->server) return; - grpc_server_shutdown(f->server); + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck(f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)).type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; } |