diff options
author | Yuchen Zeng <zyc@google.com> | 2017-03-23 10:58:49 -0700 |
---|---|---|
committer | Yuchen Zeng <zyc@google.com> | 2017-03-23 10:58:49 -0700 |
commit | d3360844f310a78ffbf26ad9d964cf1e5ee9e2f2 (patch) | |
tree | 7346811cf030078ec5f076f3443e26dc2bbc39b6 /test/core/client_channel/resolvers | |
parent | 937302b0df8d18f0cba94b2fd5f9804a138c0b3a (diff) | |
parent | 6f1e443a519cd28d97be78c5ca2ca72a45f6b598 (diff) |
Merge remote-tracking branch 'upstream/master' into cares_rebase
Diffstat (limited to 'test/core/client_channel/resolvers')
-rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_connectivity_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c index 7eeabfbe5d..8449afcbbe 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c @@ -59,7 +59,7 @@ static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr, if (g_fail_resolution) { g_fail_resolution = false; gpr_mu_unlock(&g_mu); - error = GRPC_ERROR_CREATE("Forced Failure"); + error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Failure"); } else { gpr_mu_unlock(&g_mu); *addrs = gpr_malloc(sizeof(**addrs)); |