diff options
author | Muxi Yan <mxyan@google.com> | 2017-12-13 14:04:45 -0800 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2017-12-13 14:04:45 -0800 |
commit | 032e9b32dc5978a042bdda5c3031ae6cbd928973 (patch) | |
tree | 9a9102f17700c05003cb2c85801913e48637ddf5 /test/core/end2end | |
parent | 86ece2c8f6740bf046cddbe66e6cec12d50fb29b (diff) | |
parent | 91a851c6e1f6bc7c1dbf84ea12558d535c911252 (diff) | |
download | grpc-grpc-032e9b32dc5978a042bdda5c3031ae6cbd928973.tar.gz |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'test/core/end2end')
-rw-r--r-- | test/core/end2end/dualstack_socket_test.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index ad2b24fdb0..2ba1c17c2c 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -29,7 +29,9 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/support/string.h" @@ -54,6 +56,21 @@ static void drain_cq(grpc_completion_queue* cq) { static void do_nothing(void* ignored) {} +static void log_resolved_addrs(const char* label, const char* hostname) { + grpc_resolved_addresses* res = nullptr; + grpc_error* error = grpc_blocking_resolve_address(hostname, "80", &res); + if (error != GRPC_ERROR_NONE || res == nullptr) { + GRPC_LOG_IF_ERROR(hostname, error); + return; + } + for (size_t i = 0; i < res->naddrs; ++i) { + char* addr_str = grpc_sockaddr_to_uri(&res->addrs[i]); + gpr_log(GPR_INFO, "%s: %s", label, addr_str); + gpr_free(addr_str); + } + grpc_resolved_addresses_destroy(res); +} + void test_connect(const char* server_host, const char* client_host, int port, int expect_ok) { char* client_hostport; @@ -140,6 +157,8 @@ void test_connect(const char* server_host, const char* client_host, int port, gpr_log(GPR_INFO, "Testing with server=%s client=%s (expecting %s)", server_hostport, client_hostport, expect_ok ? "success" : "failure"); + log_resolved_addrs("server resolved addr", server_host); + log_resolved_addrs("client resolved addr", client_host); gpr_free(client_hostport); gpr_free(server_hostport); @@ -236,6 +255,8 @@ void test_connect(const char* server_host, const char* client_host, int port, CQ_EXPECT_COMPLETION(cqv, tag(1), 1); cq_verify(cqv); + gpr_log(GPR_INFO, "status: %d (expected: %d)", status, + GRPC_STATUS_UNAVAILABLE); GPR_ASSERT(status == GRPC_STATUS_UNAVAILABLE); } |