aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc
diff options
context:
space:
mode:
authorGravatar Alexander Polcyn <apolcyn@google.com>2018-11-30 01:59:15 -0800
committerGravatar Alexander Polcyn <apolcyn@google.com>2018-11-30 15:06:11 -0800
commitb203ed3c071361826f3b24d940e6bfa1c3d19f81 (patch)
tree17d4796077fc853de7a14a3df7201a44d057f2ba /test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc
parent7ef8fc826c52b0c4abeaead633d464197fc0bdf8 (diff)
Cancel still-active c-ares queries after 10 seconds to avoid chance of deadlock
Diffstat (limited to 'test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc')
-rw-r--r--test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc
index eb5a911748..cc041ac7f3 100644
--- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc
+++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc
@@ -64,7 +64,7 @@ static grpc_ares_request* my_dns_lookup_ares_locked(
const char* dns_server, const char* addr, const char* default_port,
grpc_pollset_set* interested_parties, grpc_closure* on_done,
grpc_lb_addresses** lb_addrs, bool check_grpclb, char** service_config_json,
- grpc_combiner* combiner) {
+ int query_timeout_ms, grpc_combiner* combiner) {
gpr_mu_lock(&g_mu);
GPR_ASSERT(0 == strcmp("test", addr));
grpc_error* error = GRPC_ERROR_NONE;