diff options
author | 2015-05-12 14:42:27 -0700 | |
---|---|---|
committer | 2015-05-12 14:42:27 -0700 | |
commit | a0a6b12c85c980aee981c5e61e6962d9f0e4acfa (patch) | |
tree | d25aca434ed5a8be2f85d20006384393eea084f4 /test/core/end2end/tests/disappearing_server.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/disappearing_server.c')
-rw-r--r-- | test/core/end2end/tests/disappearing_server.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/core/end2end/tests/disappearing_server.c b/test/core/end2end/tests/disappearing_server.c index 1e5560f40f..9bcc79d34d 100644 --- a/test/core/end2end/tests/disappearing_server.c +++ b/test/core/end2end/tests/disappearing_server.c @@ -54,14 +54,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) { @@ -132,7 +128,7 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, grpc_server_request_call(f->server, &s, &call_details, &request_metadata_recv, f->cq, f->cq, tag(101))); - cq_expect_completion(cqv, tag(101), GRPC_OP_OK); + cq_expect_completion(cqv, tag(101), 1); cq_verify(cqv); /* should be able to shut down the server early @@ -153,8 +149,8 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, op++; GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102))); - cq_expect_completion(cqv, tag(102), GRPC_OP_OK); - cq_expect_completion(cqv, tag(1), GRPC_OP_OK); + cq_expect_completion(cqv, tag(102), 1); + cq_expect_completion(cqv, tag(1), 1); cq_verify(cqv); GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); |