diff options
author | Craig Tiller <ctiller@google.com> | 2017-01-23 14:54:31 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-01-23 14:54:31 -0800 |
commit | a53c193aa5dd9916c0d60693ab1e77b3501265ed (patch) | |
tree | 68be63155952d1844b621454b1b4b6435a6a5cdd /test/core/end2end/tests/cancel_after_invoke.c | |
parent | 7fa7d6817ef99cdf75690b55962c44b40f09a700 (diff) | |
parent | 889b0a45352928e2a815c34d5f849be9641284b0 (diff) |
Merge github.com:grpc/grpc into faster_slices
Diffstat (limited to 'test/core/end2end/tests/cancel_after_invoke.c')
-rw-r--r-- | test/core/end2end/tests/cancel_after_invoke.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/core/end2end/tests/cancel_after_invoke.c b/test/core/end2end/tests/cancel_after_invoke.c index 216c363760..c3c5418f20 100644 --- a/test/core/end2end/tests/cancel_after_invoke.c +++ b/test/core/end2end/tests/cancel_after_invoke.c @@ -113,7 +113,8 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, grpc_call_details call_details; grpc_status_code status; grpc_call_error error; - grpc_slice details; + char *details = NULL; + size_t details_capacity = 0; grpc_byte_buffer *response_payload_recv = NULL; grpc_slice request_payload_slice = grpc_slice_from_copied_string("hello world"); @@ -121,9 +122,8 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, grpc_raw_byte_buffer_create(&request_payload_slice, 1); c = grpc_channel_create_call( - f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - grpc_slice_from_static_string("/foo"), - get_host_override_slice("foo.test.google.fr:1234", config), deadline, + f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, "/foo", + get_host_override_string("foo.test.google.fr:1234", config), deadline, NULL); GPR_ASSERT(c); @@ -138,6 +138,7 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; op->data.recv_status_on_client.status = &status; op->data.recv_status_on_client.status_details = &details; + op->data.recv_status_on_client.status_details_capacity = &details_capacity; op->flags = 0; op->reserved = NULL; op++; @@ -182,7 +183,7 @@ static void test_cancel_after_invoke(grpc_end2end_test_config config, grpc_byte_buffer_destroy(request_payload); grpc_byte_buffer_destroy(response_payload_recv); - grpc_slice_unref(details); + gpr_free(details); grpc_call_destroy(c); |