diff options
author | Vijay Pai <vpai@google.com> | 2016-03-28 11:09:21 -0700 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2016-03-28 11:09:21 -0700 |
commit | d0facacece41cb4ae887cb565d8d8447249d4adb (patch) | |
tree | f90fa102c47dd9972f15258a1af3ae0e6e6c3e60 /test/core/end2end/tests/cancel_in_a_vacuum.c | |
parent | 761f7bc3e4cb87af5521eae8803d27dbee64c958 (diff) | |
parent | e5cc05b5c6cee7026a0d28d39925621451506820 (diff) |
Merge branch 'master' into make_unix_sockets_great_again
Diffstat (limited to 'test/core/end2end/tests/cancel_in_a_vacuum.c')
-rw-r--r-- | test/core/end2end/tests/cancel_in_a_vacuum.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.c b/test/core/end2end/tests/cancel_in_a_vacuum.c index 214ab2b9e8..7bea7d7e65 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.c +++ b/test/core/end2end/tests/cancel_in_a_vacuum.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 @@ -76,9 +76,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; } |