diff options
| author |  jiangtaoli2016 <jiangtao@google.com> | 2017-04-15 10:20:51 -0700 |
|---|---|---|
| committer | jiangtaoli2016 <jiangtao@google.com> | 2017-04-15 10:20:51 -0700 |
| commit | e223a6a042b3123a2aee25ec0d3fe42ffd0c43e2 (patch) | |
| tree | 041120a077b83bae9f461f8e62dac5b531babaa1 /test/core/end2end/tests/large_metadata.c | |
| parent | c953b62d396d6168507520d837550f6b12d7e729 (diff) | |
| parent | 644e05e79ba04fb0f424cbb8dffce6c3cd3913ec (diff) | |
Merge branch 'master' into new_tsi
Diffstat (limited to 'test/core/end2end/tests/large_metadata.c')
| -rw-r--r-- | test/core/end2end/tests/large_metadata.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/core/end2end/tests/large_metadata.c b/test/core/end2end/tests/large_metadata.c index a670e411e9..cef03b69df 100644 --- a/test/core/end2end/tests/large_metadata.c +++ b/test/core/end2end/tests/large_metadata.c @@ -74,9 +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->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; @@ -95,6 +96,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); } // Request with a large amount of metadata. |