diff options
author | murgatroid99 <mlumish@google.com> | 2017-04-25 12:15:53 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2017-04-25 12:15:53 -0700 |
commit | 3049462b75ac557348243601896ed68ca8145522 (patch) | |
tree | 213389dd32b961b25f3833738201e857ce7ae2e3 /test/core/end2end/tests/bad_hostname.c | |
parent | 627e2a5abd2e4146c85625e98083a95846ad57e8 (diff) | |
parent | 79759fea1abd09102d38af3e13a84b69e898124b (diff) |
Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv
Diffstat (limited to 'test/core/end2end/tests/bad_hostname.c')
-rw-r--r-- | test/core/end2end/tests/bad_hostname.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/core/end2end/tests/bad_hostname.c b/test/core/end2end/tests/bad_hostname.c index c63c9c78ad..35a531cf78 100644 --- a/test/core/end2end/tests/bad_hostname.c +++ b/test/core/end2end/tests/bad_hostname.c @@ -76,9 +76,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->cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - f->cq, tag(1000), grpc_timeout_seconds_to_deadline(5), NULL) + grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000)); + GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000), + grpc_timeout_seconds_to_deadline(5), + NULL) .type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; @@ -97,6 +98,7 @@ static void end_test(grpc_end2end_test_fixture *f) { grpc_completion_queue_shutdown(f->cq); drain_cq(f->cq); grpc_completion_queue_destroy(f->cq); + grpc_completion_queue_destroy(f->shutdown_cq); } static void simple_request_body(grpc_end2end_test_fixture f) { @@ -161,7 +163,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) { grpc_metadata_array_destroy(&request_metadata_recv); grpc_call_details_destroy(&call_details); - grpc_call_destroy(c); + grpc_call_unref(c); cq_verifier_destroy(cqv); } |