diff options
author | yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
---|---|---|
committer | yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
commit | 6b16aaae96d7f8664870da8b4e36ea0da10d667e (patch) | |
tree | d3b6915ba019bae703f6e6d87351a454be2a3aba /test/core/iomgr/resolve_address_test.c | |
parent | 57d1e082689c96e2721122748b08583d6b63d394 (diff) | |
parent | a4e7ecab1a512bae1c40b9b301661ba24677b0ed (diff) |
merge and resolve conflict
Diffstat (limited to 'test/core/iomgr/resolve_address_test.c')
-rw-r--r-- | test/core/iomgr/resolve_address_test.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index a66edc9df2..c3ede1801d 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -59,28 +59,36 @@ static void must_fail(grpc_exec_ctx *exec_ctx, void *evp, static void test_localhost(void) { gpr_event ev; gpr_event_init(&ev); - grpc_resolve_address("localhost:1", NULL, must_succeed, &ev); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolve_address(&exec_ctx, "localhost:1", NULL, must_succeed, &ev); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } static void test_default_port(void) { gpr_event ev; gpr_event_init(&ev); - grpc_resolve_address("localhost", "1", must_succeed, &ev); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolve_address(&exec_ctx, "localhost", "1", must_succeed, &ev); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } static void test_missing_default_port(void) { gpr_event ev; gpr_event_init(&ev); - grpc_resolve_address("localhost", NULL, must_fail, &ev); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolve_address(&exec_ctx, "localhost", NULL, must_fail, &ev); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } static void test_ipv6_with_port(void) { gpr_event ev; gpr_event_init(&ev); - grpc_resolve_address("[2001:db8::1]:1", NULL, must_succeed, &ev); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolve_address(&exec_ctx, "[2001:db8::1]:1", NULL, must_succeed, &ev); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } @@ -92,7 +100,9 @@ static void test_ipv6_without_port(void) { for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { gpr_event ev; gpr_event_init(&ev); - grpc_resolve_address(kCases[i], "80", must_succeed, &ev); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolve_address(&exec_ctx, kCases[i], "80", must_succeed, &ev); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } } @@ -105,7 +115,9 @@ static void test_invalid_ip_addresses(void) { for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { gpr_event ev; gpr_event_init(&ev); - grpc_resolve_address(kCases[i], NULL, must_fail, &ev); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolve_address(&exec_ctx, kCases[i], NULL, must_fail, &ev); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } } @@ -118,7 +130,9 @@ static void test_unparseable_hostports(void) { for (i = 0; i < sizeof(kCases) / sizeof(*kCases); i++) { gpr_event ev; gpr_event_init(&ev); - grpc_resolve_address(kCases[i], "1", must_fail, &ev); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_resolve_address(&exec_ctx, kCases[i], "1", must_fail, &ev); + grpc_exec_ctx_finish(&exec_ctx); GPR_ASSERT(gpr_event_wait(&ev, test_deadline())); } } |