diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-11 14:34:09 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-11 14:34:09 -0700 |
| commit | 9314361096b13be05603fd60f6ef055f7de6468a (patch) | |
| tree | 8529fee7386b90d255e241f70bc3388c71d9f523 /test/core/end2end/tests/invoke_large_request.c | |
| parent | b1d3dcdb7db540b7dfa2efad269cd56738ff7e79 (diff) | |
| parent | 380c3a7e1e801cf5a24164a518dc59d6c431f5db (diff) | |
Merge github.com:grpc/grpc into foo
Diffstat (limited to 'test/core/end2end/tests/invoke_large_request.c')
| -rw-r--r-- | test/core/end2end/tests/invoke_large_request.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/end2end/tests/invoke_large_request.c b/test/core/end2end/tests/invoke_large_request.c index d799bd8ccf..f4b93d9873 100644 --- a/test/core/end2end/tests/invoke_large_request.c +++ b/test/core/end2end/tests/invoke_large_request.c @@ -58,14 +58,14 @@ 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 void drain_cq(grpc_completion_queue *cq) { grpc_event ev; do { - ev = grpc_completion_queue_next(cq, n_seconds_time(5), NULL); + ev = grpc_completion_queue_next(cq, n_seconds_from_now(5), NULL); } while (ev.type != GRPC_QUEUE_SHUTDOWN); } @@ -128,7 +128,6 @@ static void test_invoke_large_request(grpc_end2end_test_config config, grpc_raw_byte_buffer_create(&request_payload_slice, 1); grpc_byte_buffer *response_payload = grpc_raw_byte_buffer_create(&response_payload_slice, 1); - gpr_timespec deadline = n_seconds_time(30); cq_verifier *cqv = cq_verifier_create(f.cq); grpc_op ops[6]; grpc_op *op; @@ -143,6 +142,7 @@ static void test_invoke_large_request(grpc_end2end_test_config config, grpc_slice details; int was_cancelled = 2; + gpr_timespec deadline = n_seconds_from_now(30); c = grpc_channel_create_call( f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, grpc_slice_from_static_string("/foo"), |