diff options
author | David Garcia Quintas <dgq@google.com> | 2016-03-31 09:43:03 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-03-31 09:43:03 -0700 |
commit | 2877d7398e9f6bf815af3f42f21cb4c3d917be2e (patch) | |
tree | 7a08a3e544cf8583d4bb2405bb53e48ebdac5a65 /test/core/end2end/tests/ping_pong_streaming.c | |
parent | 2c73b22885ea07ecd338e71a0baf5cdcfc45605a (diff) | |
parent | 2b9012362ca03181eefaec22238c6100e77bb736 (diff) |
Merge branch 'master' of github.com:grpc/grpc into lb_resolvers
Diffstat (limited to 'test/core/end2end/tests/ping_pong_streaming.c')
-rw-r--r-- | test/core/end2end/tests/ping_pong_streaming.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/tests/ping_pong_streaming.c b/test/core/end2end/tests/ping_pong_streaming.c index 8351f508c5..7af01497c5 100644 --- a/test/core/end2end/tests/ping_pong_streaming.c +++ b/test/core/end2end/tests/ping_pong_streaming.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 @@ -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; } |