diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-02-01 16:12:08 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-02-01 16:12:08 -0800 |
| commit | 86d2115553bb0eaf0f02c78c9f1d7696c42f424c (patch) | |
| tree | c6515df23cecab3d8698257ba0dc9b17581185de /test/core/end2end/tests/idempotent_request.c | |
| parent | 5488d40bdd4b79fca8d0beeb0bcab126ae698996 (diff) | |
| parent | e042801b1c3154cbf37b62ccc54d334689d0b0ce (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'test/core/end2end/tests/idempotent_request.c')
| -rw-r--r-- | test/core/end2end/tests/idempotent_request.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/idempotent_request.c b/test/core/end2end/tests/idempotent_request.c index 65accbb789..cef2e100be 100644 --- a/test/core/end2end/tests/idempotent_request.c +++ b/test/core/end2end/tests/idempotent_request.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; |