diff options
author | 2017-02-13 10:13:24 -0800 | |
---|---|---|
committer | 2017-02-13 10:13:24 -0800 | |
commit | 7317195b8e1e05109ee2e71131e90a90a0a09f40 (patch) | |
tree | 5ba8bf3bc89c55b83b27a2b499af71ee380c10e1 /test/core/end2end/tests/streaming_error_response.c | |
parent | 191d52c4c1246b7fb80a901186fa39f101738815 (diff) | |
parent | ee31910271a72c4e454a9d64ceafa530566388a6 (diff) |
Merge branch 'master' of github.com:grpc/grpc into compression_implicit_encoding
Diffstat (limited to 'test/core/end2end/tests/streaming_error_response.c')
-rw-r--r-- | test/core/end2end/tests/streaming_error_response.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/streaming_error_response.c b/test/core/end2end/tests/streaming_error_response.c index d5fefd13aa..42055907c8 100644 --- a/test/core/end2end/tests/streaming_error_response.c +++ b/test/core/end2end/tests/streaming_error_response.c @@ -60,7 +60,7 @@ static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, } static gpr_timespec n_seconds_time(int n) { - return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); + return grpc_timeout_seconds_to_deadline(n); } static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } @@ -76,7 +76,7 @@ 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) + f->cq, tag(1000), grpc_timeout_seconds_to_deadline(5), NULL) .type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; |