diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-08-13 22:25:15 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-08-13 22:25:15 -0700 |
| commit | 455dc6ff0df2825ca6cfa35b29a4439943567c73 (patch) | |
| tree | 798fcb62f115b541d1085e45089931ccfe702304 /test/core/end2end/tests/no_op.c | |
| parent | 5941335be3700ea9bfe137b2eeccf9cba0540300 (diff) | |
| parent | 0791cf0dcdad6c2a972187dcc9d69dc99adecfbe (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into cpp_auth_md_processor
Diffstat (limited to 'test/core/end2end/tests/no_op.c')
| -rw-r--r-- | test/core/end2end/tests/no_op.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/core/end2end/tests/no_op.c b/test/core/end2end/tests/no_op.c index 8ead664758..565d4ea280 100644 --- a/test/core/end2end/tests/no_op.c +++ b/test/core/end2end/tests/no_op.c @@ -68,7 +68,7 @@ static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; do { - ev = grpc_completion_queue_next(cq, five_seconds_time()); + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); } while (ev.type != GRPC_QUEUE_SHUTDOWN); } @@ -76,7 +76,8 @@ static void shutdown_server(grpc_end2end_test_fixture *f) { if (!f->server) return; 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)) + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), + NULL) .type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; |