diff options
Diffstat (limited to 'test/core/end2end/tests/cancel_after_accept_and_writes_closed.c')
| -rw-r--r-- | test/core/end2end/tests/cancel_after_accept_and_writes_closed.c | 17 |
1 files changed, 7 insertions, 10 deletions
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 417ff98a85..4b7fdd62b3 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 @@ -94,12 +94,9 @@ static void end_test(grpc_end2end_test_fixture *f) { shutdown_server(f); shutdown_client(f); - grpc_completion_queue_shutdown(f->server_cq); - drain_cq(f->server_cq); - grpc_completion_queue_destroy(f->server_cq); - grpc_completion_queue_shutdown(f->client_cq); - drain_cq(f->client_cq); - grpc_completion_queue_destroy(f->client_cq); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); + grpc_completion_queue_destroy(f->cq); } /* Cancel after accept with a writes closed, no payload */ @@ -129,7 +126,7 @@ static void test_cancel_after_accept_and_writes_closed( grpc_byte_buffer_create(&response_payload_slice, 1); int was_cancelled = 2; - c = grpc_channel_create_call(f.client, f.client_cq, "/foo", + c = grpc_channel_create_call(f.client, f.cq, "/foo", "foo.test.google.fr", deadline); GPR_ASSERT(c); @@ -163,8 +160,8 @@ 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, - f.server_cq, tag(2))); + &request_metadata_recv, f.cq, + f.cq, tag(2))); cq_expect_completion(cqv, tag(2), GRPC_OP_OK); cq_verify(cqv); @@ -187,7 +184,7 @@ static void test_cancel_after_accept_and_writes_closed( cq_expect_completion(cqv, tag(3), GRPC_OP_OK); cq_expect_completion(cqv, tag(1), GRPC_OP_OK); - cq_verify(v_client); + cq_verify(cqv); GPR_ASSERT(status == mode.expect_status); GPR_ASSERT(0 == strcmp(details, mode.expect_details)); |