diff options
author | Craig Tiller <ctiller@google.com> | 2015-05-12 14:42:27 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-05-12 14:42:27 -0700 |
commit | a0a6b12c85c980aee981c5e61e6962d9f0e4acfa (patch) | |
tree | d25aca434ed5a8be2f85d20006384393eea084f4 /test/core/end2end/tests/cancel_after_invoke.c | |
parent | 79d4c8b08f54f02af526267ff4d4951666fb5fe5 (diff) | |
parent | 54478f8562b812595b0d9102fc4703cdb04a627f (diff) |
Merge branch 'bye-bye-completion-queue-pie' into we-dont-need-no-backup
Diffstat (limited to 'test/core/end2end/tests/cancel_after_invoke.c')
-rw-r--r-- | test/core/end2end/tests/cancel_after_invoke.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/core/end2end/tests/cancel_after_invoke.c b/test/core/end2end/tests/cancel_after_invoke.c index 7ee4350e11..cf12269d00 100644 --- a/test/core/end2end/tests/cancel_after_invoke.c +++ b/test/core/end2end/tests/cancel_after_invoke.c @@ -68,14 +68,10 @@ static gpr_timespec n_seconds_time(int n) { static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } static void drain_cq(grpc_completion_queue *cq) { - grpc_event *ev; - grpc_completion_type type; + grpc_event ev; do { ev = grpc_completion_queue_next(cq, five_seconds_time()); - GPR_ASSERT(ev); - type = ev->type; - grpc_event_finish(ev); - } while (type != GRPC_QUEUE_SHUTDOWN); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); } static void shutdown_server(grpc_end2end_test_fixture *f) { @@ -156,7 +152,7 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c)); - cq_expect_completion(cqv, tag(1), GRPC_OP_OK); + cq_expect_completion(cqv, tag(1), 1); cq_verify(cqv); GPR_ASSERT(status == mode.expect_status); |