diff options
author | Sree Kuchibhotla <sreek@google.com> | 2017-04-05 17:17:54 -0700 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2017-04-05 17:17:54 -0700 |
commit | 084c51e888629257f8103c33af0d1d75ecdf10d0 (patch) | |
tree | ec97cdff02a578fee466d39a2a51752e05c9272b /test/core/end2end/tests/default_host.c | |
parent | f7c673a8c789e6b521b2b83c82eb433900fd4b78 (diff) | |
parent | d4da50b2cb1575b9a2661c47e7d393931d28bc84 (diff) |
Merge branch 'master' into bm_cq_multi_threads
Diffstat (limited to 'test/core/end2end/tests/default_host.c')
-rw-r--r-- | test/core/end2end/tests/default_host.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/core/end2end/tests/default_host.c b/test/core/end2end/tests/default_host.c index bc1829b24b..8dccca20c7 100644 --- a/test/core/end2end/tests/default_host.c +++ b/test/core/end2end/tests/default_host.c @@ -59,16 +59,18 @@ static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, return f; } -static gpr_timespec n_seconds_time(int n) { +static gpr_timespec n_seconds_from_now(int n) { return grpc_timeout_seconds_to_deadline(n); } -static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } +static gpr_timespec five_seconds_from_now(void) { + return n_seconds_from_now(5); +} static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; do { - ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); + ev = grpc_completion_queue_next(cq, five_seconds_from_now(), NULL); } while (ev.type != GRPC_QUEUE_SHUTDOWN); } @@ -100,7 +102,6 @@ static void end_test(grpc_end2end_test_fixture *f) { static void simple_request_body(grpc_end2end_test_fixture f) { grpc_call *c; grpc_call *s; - gpr_timespec deadline = five_seconds_time(); cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; @@ -114,6 +115,7 @@ static void simple_request_body(grpc_end2end_test_fixture f) { int was_cancelled = 2; char *peer; + gpr_timespec deadline = five_seconds_from_now(); c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, grpc_slice_from_static_string("/foo"), NULL, deadline, NULL); |