diff options
author | apolcyn <apolcyn@google.com> | 2019-01-10 14:42:06 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-10 14:42:06 -0800 |
commit | 34ca89765d70a9b173b6c2a507ef105c05b13dbf (patch) | |
tree | 813da6d29a9565b31ca24a4f30fd0d5b497db62a /test/core | |
parent | 8f09f779497a946ad150c81d3119cefc446d7f71 (diff) | |
parent | 0ec937207431a8512e3820d2da808693e2a21a48 (diff) |
Merge pull request #16862 from apolcyn/convert_tests_to_cares
Switch the default DNS resolver from native to c-ares
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_test.cc | 11 | ||||
-rw-r--r-- | test/core/surface/concurrent_connectivity_test.cc | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 571746abe8..6f153cc9bf 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -22,6 +22,8 @@ #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" +#include "src/core/lib/gpr/env.h" +#include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/combiner.h" #include "test/core/util/test_config.h" @@ -72,12 +74,13 @@ int main(int argc, char** argv) { test_succeeds(dns, "dns:10.2.1.1:1234"); test_succeeds(dns, "dns:www.google.com"); test_succeeds(dns, "dns:///www.google.com"); - if (grpc_resolve_address == grpc_resolve_address_ares) { - test_succeeds(dns, "dns://8.8.8.8/8.8.8.8:8888"); - } else { + char* resolver_env = gpr_getenv("GRPC_DNS_RESOLVER"); + if (resolver_env != nullptr && gpr_stricmp(resolver_env, "native") == 0) { test_fails(dns, "dns://8.8.8.8/8.8.8.8:8888"); + } else { + test_succeeds(dns, "dns://8.8.8.8/8.8.8.8:8888"); } - + gpr_free(resolver_env); { grpc_core::ExecCtx exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index f606e89ac8..b201568f48 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -44,7 +44,7 @@ #define NUM_OUTER_LOOPS 10 #define NUM_INNER_LOOPS 10 #define DELAY_MILLIS 10 -#define POLL_MILLIS 3000 +#define POLL_MILLIS 15000 #define NUM_OUTER_LOOPS_SHORT_TIMEOUTS 10 #define NUM_INNER_LOOPS_SHORT_TIMEOUTS 100 |