From 64be9f7a30a4bcb9ce3647f11ba9e06994aa3bb7 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 4 May 2015 14:53:51 -0700 Subject: C Core API cleanup. Simplify grpc_event into something that can be non-heap allocated. Deprecate grpc_event_finish. Remove grpc_op_error - use an int as this is more idiomatic C style. --- .../end2end/tests/cancel_after_accept_and_writes_closed.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'test/core/end2end/tests/cancel_after_accept_and_writes_closed.c') diff --git a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c b/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c index f8733ef444..57c696c76c 100644 --- a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c +++ b/test/core/end2end/tests/cancel_after_accept_and_writes_closed.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) { @@ -166,7 +162,7 @@ static void test_cancel_after_accept_and_writes_closed( GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( f.server, &s, &call_details, &request_metadata_recv, f.server_cq, tag(2))); - cq_expect_completion(v_server, tag(2), GRPC_OP_OK); + cq_expect_completion(v_server, tag(2), 1); cq_verify(v_server); op = ops; @@ -186,10 +182,10 @@ static void test_cancel_after_accept_and_writes_closed( GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c)); - cq_expect_completion(v_server, tag(3), GRPC_OP_OK); + cq_expect_completion(v_server, tag(3), 1); cq_verify(v_server); - cq_expect_completion(v_client, tag(1), GRPC_OP_OK); + cq_expect_completion(v_client, tag(1), 1); cq_verify(v_client); GPR_ASSERT(status == mode.expect_status); -- cgit v1.2.3