diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-03-28 17:03:38 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-03-28 17:03:38 -0700 |
| commit | b3b724971f7ed3d97027ca22f46fb9521a6c2043 (patch) | |
| tree | 9c2acc3bb60f5bcd13b049c5f63a26d2d470abb0 /test/core/end2end/tests/simple_delayed_request.c | |
| parent | 1809bba1ca7332836a20d8e3f8222b18d594b688 (diff) | |
| parent | 9a0f14ba9959ac0cbf672282f8376b4e4e3b14dc (diff) | |
Merge branch 'master' of github.com:grpc/grpc into sockaddr_resolver_lb
Diffstat (limited to 'test/core/end2end/tests/simple_delayed_request.c')
| -rw-r--r-- | test/core/end2end/tests/simple_delayed_request.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/tests/simple_delayed_request.c b/test/core/end2end/tests/simple_delayed_request.c index 0afef7503b..e9f5a38c76 100644 --- a/test/core/end2end/tests/simple_delayed_request.c +++ b/test/core/end2end/tests/simple_delayed_request.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,9 +63,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; } |