diff options
| author |  Robbie Shade <rjshade@google.com> | 2017-01-17 09:14:29 -0500 |
|---|---|---|
| committer | Robbie Shade <rjshade@google.com> | 2017-01-31 15:40:20 -0500 |
| commit | ca7effcdff69baba8e52e4c83fe808491df60f36 (patch) | |
| tree | 7e04f13f655f44c5930233381b615e1d54e5386e /test/core/handshake | |
| parent | c88834ba996084db5f530706a09892bdd900e7dc (diff) | |
Replace timeout/scaling macros with functions.
Diffstat (limited to 'test/core/handshake')
| -rw-r--r-- | test/core/handshake/client_ssl.c | 4 | ||||
| -rw-r--r-- | test/core/handshake/server_ssl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/core/handshake/client_ssl.c b/test/core/handshake/client_ssl.c index 613251b835..a22133e629 100644 --- a/test/core/handshake/client_ssl.c +++ b/test/core/handshake/client_ssl.c @@ -274,8 +274,8 @@ static bool client_ssl_test(char *server_alpn_preferred) { grpc_completion_queue *cq = grpc_completion_queue_create(NULL); while (state != GRPC_CHANNEL_READY && retries-- > 0) { grpc_channel_watch_connectivity_state( - channel, state, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(3), cq, NULL); - gpr_timespec cq_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); + channel, state, grpc_timeout_seconds_to_deadline(3), cq, NULL); + gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(5); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); state = diff --git a/test/core/handshake/server_ssl.c b/test/core/handshake/server_ssl.c index f39b0040a6..0bd5a03cff 100644 --- a/test/core/handshake/server_ssl.c +++ b/test/core/handshake/server_ssl.c @@ -113,7 +113,7 @@ static void server_thread(void *arg) { // sleeping between polls. int retries = 10; while (!gpr_event_get(&client_handshake_complete) && retries-- > 0) { - const gpr_timespec cq_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); + const gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(1); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, NULL); GPR_ASSERT(ev.type == GRPC_QUEUE_TIMEOUT); } @@ -122,7 +122,7 @@ static void server_thread(void *arg) { grpc_server_shutdown_and_notify(server, cq, NULL); grpc_completion_queue_shutdown(cq); - const gpr_timespec cq_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); + const gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(5); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); |