Address review comments

1 files changed, 30 insertions, 8 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 57dfb5cb12..dd7fa89d69 100644
--- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c
+++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c
@@ -45,24 +45,46 @@
 static gpr_mu g_mu;
 static bool g_fail_resolution = true;
 
-static int my_resolve_address(const char *name, const char *addr,
-                              grpc_resolved_addresses **addrs,
-                              grpc_error **error) {
+// static int my_resolve_address(const char *name, const char *addr,
+//                               grpc_resolved_addresses **addrs,
+//                               grpc_error **error) {
+//   gpr_mu_lock(&g_mu);
+//   GPR_ASSERT(0 == strcmp("test", name));
+//   if (g_fail_resolution) {
+//     g_fail_resolution = false;
+//     gpr_mu_unlock(&g_mu);
+//     *error = GRPC_ERROR_CREATE("Forced Failure");
+//   } else {
+//     gpr_mu_unlock(&g_mu);
+//     *addrs = gpr_malloc(sizeof(**addrs));
+//     (*addrs)->naddrs = 1;
+//     (*addrs)->addrs = gpr_malloc(sizeof(*(*addrs)->addrs));
+//     (*addrs)->addrs[0].len = 123;
+//     *error = GRPC_ERROR_NONE;
+//   }
+//   return 1;
+// }
+
+static void my_resolve_address(grpc_exec_ctx *exec_ctx, const char *addr,
+                               const char *default_port,
+                               grpc_pollset_set *interested_parties,
+                               grpc_closure *on_done,
+                               grpc_resolved_addresses **addrs) {
   gpr_mu_lock(&g_mu);
-  GPR_ASSERT(0 == strcmp("test", name));
+  GPR_ASSERT(0 == strcmp("test", addr));
+  grpc_error *error = GRPC_ERROR_NONE;
   if (g_fail_resolution) {
     g_fail_resolution = false;
     gpr_mu_unlock(&g_mu);
-    *error = GRPC_ERROR_CREATE("Forced Failure");
+    error = GRPC_ERROR_CREATE("Forced Failure");
   } else {
     gpr_mu_unlock(&g_mu);
     *addrs = gpr_malloc(sizeof(**addrs));
     (*addrs)->naddrs = 1;
     (*addrs)->addrs = gpr_malloc(sizeof(*(*addrs)->addrs));
     (*addrs)->addrs[0].len = 123;
-    *error = GRPC_ERROR_NONE;
   }
-  return 1;
+  grpc_exec_ctx_sched(exec_ctx, on_done, error, NULL);
 }
 
 static grpc_resolver *create_resolver(const char *name) {
@@ -102,7 +124,7 @@ int main(int argc, char **argv) {
 
   grpc_init();
   gpr_mu_init(&g_mu);
-  grpc_customized_resolve_address = my_resolve_address;
+  grpc_resolve_address = my_resolve_address;
 
   grpc_resolver *resolver = create_resolver("dns:test");