diff options
author | 2017-02-03 11:54:26 -0800 | |
---|---|---|
committer | 2017-02-03 11:54:26 -0800 | |
commit | c40b34745ac5aac3cb9954d2b9fa52edb99202de (patch) | |
tree | 76e41c4ef0d84b8f6b837a032d882be97df5d2ab /test/core/end2end/tests/network_status_change.c | |
parent | 9a3997c8537d168f4b869c3912994c2dc6f476ba (diff) | |
parent | 4fd2bf6ec964dae973040984e5b5b387fe2f72e1 (diff) |
Merge branch 'bwest' into assert_writes
Diffstat (limited to 'test/core/end2end/tests/network_status_change.c')
-rw-r--r-- | test/core/end2end/tests/network_status_change.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/network_status_change.c b/test/core/end2end/tests/network_status_change.c index fe3afb7249..9cef02b2b3 100644 --- a/test/core/end2end/tests/network_status_change.c +++ b/test/core/end2end/tests/network_status_change.c @@ -61,7 +61,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(500); } @@ -77,7 +77,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; |