diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-02-13 10:13:24 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-02-13 10:13:24 -0800 |
| commit | 7317195b8e1e05109ee2e71131e90a90a0a09f40 (patch) | |
| tree | 5ba8bf3bc89c55b83b27a2b499af71ee380c10e1 /test/core/bad_ssl/server_common.c | |
| parent | 191d52c4c1246b7fb80a901186fa39f101738815 (diff) | |
| parent | ee31910271a72c4e454a9d64ceafa530566388a6 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression_implicit_encoding
Diffstat (limited to 'test/core/bad_ssl/server_common.c')
| -rw-r--r-- | test/core/bad_ssl/server_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/bad_ssl/server_common.c b/test/core/bad_ssl/server_common.c index 14b1892c2e..6a4313eafd 100644 --- a/test/core/bad_ssl/server_common.c +++ b/test/core/bad_ssl/server_common.c @@ -84,7 +84,7 @@ void bad_ssl_run(grpc_server *server) { gpr_log(GPR_INFO, "Shutting down due to SIGINT"); grpc_server_shutdown_and_notify(server, cq, NULL); GPR_ASSERT(grpc_completion_queue_pluck( - cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + cq, NULL, grpc_timeout_seconds_to_deadline(5), NULL) .type == GRPC_OP_COMPLETE); grpc_completion_queue_shutdown(cq); shutdown_started = 1; |