aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/client_channel
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2017-03-24 09:52:02 -0700
committerGravatar Sree Kuchibhotla <sreek@google.com>2017-03-24 09:52:02 -0700
commit7b81147cc91081ad9f0e077af99c5a7cfc946de4 (patch)
treeddd6b1297c349ae9ce19800d860657c017fb8333 /test/core/client_channel
parent2ae4fc2601c23f026e8abff2f1c1f817b72ef0b3 (diff)
parent18a7a8a9637b45e220202145b4b51dc224fbbdac (diff)
Merge branch 'master' into cq_create_api_changes
Diffstat (limited to 'test/core/client_channel')
-rw-r--r--test/core/client_channel/resolvers/dns_resolver_connectivity_test.c2
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 187757d5b3..b85ca89337 100644
--- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c
+++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c
@@ -55,7 +55,7 @@ static grpc_error *my_resolve_address(const char *name, const char *addr,
if (g_fail_resolution) {
g_fail_resolution = false;
gpr_mu_unlock(&g_mu);
- return GRPC_ERROR_CREATE("Forced Failure");
+ return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Failure");
} else {
gpr_mu_unlock(&g_mu);
*addrs = gpr_malloc(sizeof(**addrs));