diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-19 20:16:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-09-19 20:16:59 -0700 |
| commit | eb44079fcd452e2f94066ffe0944c1390987b45e (patch) | |
| tree | c829b268733eeb5e9b2a0494057d1f21d9d82a60 /test | |
| parent | 1bf1b586c7af6e4a302f6aed5649231e308d1bd8 (diff) | |
| parent | 4a6b08aa4706b870f51ec61d03fd786a2fc3066a (diff) | |
Merge pull request #12646 from yashykt/libuv_fix
Add missing exec_ctx parameter to pollset_uv.c
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/iomgr/tcp_client_uv_test.c | 8 | ||||
| -rw-r--r-- | test/core/iomgr/tcp_server_uv_test.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/core/iomgr/tcp_client_uv_test.c b/test/core/iomgr/tcp_client_uv_test.c index 9927356613..b0ff11b39a 100644 --- a/test/core/iomgr/tcp_client_uv_test.c +++ b/test/core/iomgr/tcp_client_uv_test.c @@ -46,11 +46,11 @@ static gpr_timespec test_deadline(void) { return grpc_timeout_seconds_to_deadline(10); } -static void finish_connection() { +static void finish_connection(grpc_exec_ctx *exec_ctx) { gpr_mu_lock(g_mu); g_connections_complete++; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, g_pollset, NULL))); gpr_mu_unlock(g_mu); } @@ -63,7 +63,7 @@ static void must_succeed(grpc_exec_ctx *exec_ctx, void *arg, GRPC_ERROR_CREATE_FROM_STATIC_STRING("must_succeed called")); grpc_endpoint_destroy(exec_ctx, g_connecting); g_connecting = NULL; - finish_connection(); + finish_connection(exec_ctx); } static void must_fail(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { diff --git a/test/core/iomgr/tcp_server_uv_test.c b/test/core/iomgr/tcp_server_uv_test.c index 8f4d553d1e..bd8ccb4f60 100644 --- a/test/core/iomgr/tcp_server_uv_test.c +++ b/test/core/iomgr/tcp_server_uv_test.c @@ -111,8 +111,8 @@ static void on_connect(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT( - GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL))); + GPR_ASSERT(GRPC_LOG_IF_ERROR("pollset_kick", + grpc_pollset_kick(exec_ctx, g_pollset, NULL))); gpr_mu_unlock(g_mu); } |