diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-01-19 18:51:12 +0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-19 18:51:12 +0800 |
| commit | e33d81024e88f598bff46b4c8e2ae25dcb9c5b3d (patch) | |
| tree | 676d8c5dd30832e4fd8f2ba0cd5aea7410c2ebda /src/objective-c/tests | |
| parent | d87b9fb4c445182bf24d4e7782d624cc0ba557dd (diff) | |
| parent | 428eb037f53ca48d236dc095f4ed0ab49a7fa2a1 (diff) | |
Merge branch 'master' into fix-loupe-exception
Diffstat (limited to 'src/objective-c/tests')
| -rw-r--r-- | src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m index e885011d04..01612a84b2 100644 --- a/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m +++ b/src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m @@ -94,7 +94,7 @@ static void process_auth_failure(void *state, grpc_auth_context *ctx, static void cronet_init_client_secure_fullstack(grpc_end2end_test_fixture *f, grpc_channel_args *client_args, - cronet_engine *cronetEngine) { + stream_engine *cronetEngine) { fullstack_secure_fixture_data *ffd = f->fixture_data; f->client = grpc_cronet_secure_channel_create(cronetEngine, ffd->localaddr, client_args, NULL); @@ -125,11 +125,12 @@ static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { static void cronet_init_client_simple_ssl_secure_fullstack( grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { grpc_exec_ctx ctx = GRPC_EXEC_CTX_INIT; - cronet_engine *cronetEngine = [Cronet getGlobalEngine]; + stream_engine *cronetEngine = [Cronet getGlobalEngine]; grpc_channel_args *new_client_args = grpc_channel_args_copy(client_args); cronet_init_client_secure_fullstack(f, new_client_args, cronetEngine); grpc_channel_args_destroy(&ctx, new_client_args); + grpc_exec_ctx_finish(&ctx); } static int fail_server_auth_check(grpc_channel_args *server_args) { |