diff options
| author |  yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
| commit | 5ea46ab2482c3724fbc7fd0aab55f324fb65999c (patch) | |
| tree | 55eebc4aae8f06f931c8f75ddf84d56595f99fa1 /test/core/end2end/tests/no_op.c | |
| parent | 3abe60b9d08ff5a784a39f7c4a10c631547c3526 (diff) | |
| parent | d426864934ac60f46e538ba81932e405fa8949b1 (diff) | |
merge with upstream and resolve conflicts
Diffstat (limited to 'test/core/end2end/tests/no_op.c')
| -rw-r--r-- | test/core/end2end/tests/no_op.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/core/end2end/tests/no_op.c b/test/core/end2end/tests/no_op.c index 1f32691e63..8ead664758 100644 --- a/test/core/end2end/tests/no_op.c +++ b/test/core/end2end/tests/no_op.c @@ -74,8 +74,10 @@ static void drain_cq(grpc_completion_queue *cq) { static void shutdown_server(grpc_end2end_test_fixture *f) { if (!f->server) return; - grpc_server_shutdown_and_notify(f->server, f->server_cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck(f->server_cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)).type == GRPC_OP_COMPLETE); + 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)) + .type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; } @@ -90,12 +92,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); } static void test_no_op(grpc_end2end_test_config config) { |