diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-10-05 10:18:05 -0700 |
| commit | b0f3bf16cee1d893fc0414fcfe1060baac4eaa9b (patch) | |
| tree | 747298bf60f8a0b1c519a33d6084fad42fc192de /test/core/end2end/tests/max_concurrent_streams.c | |
| parent | 350835a9566a4b56bfd409108ec235ef2424b630 (diff) | |
| parent | a9154a36fbc019b87f4d62ce16b346f3d44ec2de (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'test/core/end2end/tests/max_concurrent_streams.c')
| -rw-r--r-- | test/core/end2end/tests/max_concurrent_streams.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/end2end/tests/max_concurrent_streams.c b/test/core/end2end/tests/max_concurrent_streams.c index 87eb4dd451..bb64200d9e 100644 --- a/test/core/end2end/tests/max_concurrent_streams.c +++ b/test/core/end2end/tests/max_concurrent_streams.c @@ -75,9 +75,9 @@ 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) - .type == GRPC_OP_COMPLETE); + GPR_ASSERT(grpc_completion_queue_pluck(f->cq, tag(1000), + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), + NULL).type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; } |