diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-02 12:02:37 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-02 12:02:37 -0800 |
| commit | 6c5d08f3ac6bb4fbdeb48723af891eac9e277156 (patch) | |
| tree | 5471e400c9009e343ae881671d7a2069ac987a95 /test/core/end2end/tests/payload.c | |
| parent | f7af2a9a0517ada19e0ce1a092ca064985f604e5 (diff) | |
| parent | 6c1d43bdd2242e68b7e494cb7c6ff511c5dc76ef (diff) | |
Merge branch 'bm_stream' into bm_perf
Diffstat (limited to 'test/core/end2end/tests/payload.c')
| -rw-r--r-- | test/core/end2end/tests/payload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/payload.c b/test/core/end2end/tests/payload.c index e23013d1a7..b04ee5705c 100644 --- a/test/core/end2end/tests/payload.c +++ b/test/core/end2end/tests/payload.c @@ -58,7 +58,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); } @@ -74,7 +74,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; |