diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-06-19 14:00:52 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-19 14:00:52 -0700 |
| commit | 68d4f50f77641f80794134f0d4149034df1706f0 (patch) | |
| tree | a8a6a2221c5b408e63d4c51b6cb9773ecca8e566 /test/core/surface | |
| parent | 4d1da600b525a514f0a5c1d768fa3a58d65ecded (diff) | |
| parent | 9e3e64604d9a3bb4bea9202ede844e6f7b592eeb (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'test/core/surface')
| -rw-r--r-- | test/core/surface/num_external_connectivity_watchers_test.cc | 2 | ||||
| -rw-r--r-- | test/core/surface/sequential_connectivity_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index 467deeeaec..7b7a0b6dfc 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -168,7 +168,7 @@ static const test_fixture insecure_test = { static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel_credentials* ssl_creds = - grpc_ssl_credentials_create(test_root_cert, nullptr, nullptr); + grpc_ssl_credentials_create(test_root_cert, nullptr, nullptr, nullptr); grpc_arg ssl_name_override = { GRPC_ARG_STRING, const_cast<char*>(GRPC_SSL_TARGET_NAME_OVERRIDE_ARG), diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 9aba4c499e..10562b3be9 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -144,7 +144,7 @@ static void secure_test_add_port(grpc_server* server, const char* addr) { static grpc_channel* secure_test_create_channel(const char* addr) { grpc_channel_credentials* ssl_creds = - grpc_ssl_credentials_create(test_root_cert, nullptr, nullptr); + grpc_ssl_credentials_create(test_root_cert, nullptr, nullptr, nullptr); grpc_arg ssl_name_override = { GRPC_ARG_STRING, const_cast<char*>(GRPC_SSL_TARGET_NAME_OVERRIDE_ARG), |