diff options
author | 2015-07-17 17:38:34 -0700 | |
---|---|---|
committer | 2015-07-17 17:38:34 -0700 | |
commit | b307ae280b974a927cd1319ffd974c1dd90ec95d (patch) | |
tree | e38b428e51ec491cc7aac5a78925540092079131 /test/core/iomgr/tcp_client_posix_test.c | |
parent | eec3b9103baa784bbcd6be10d101ab53b1f169de (diff) | |
parent | efccb3f5ce7cae89739d3a0474fcc0d6e2a5b12c (diff) |
Merge branch 'master' into zookeeper
Diffstat (limited to 'test/core/iomgr/tcp_client_posix_test.c')
-rw-r--r-- | test/core/iomgr/tcp_client_posix_test.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index b673c032b2..710cd725df 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -187,11 +187,12 @@ void test_times_out(void) { /* Make sure the event doesn't trigger early */ gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); while (gpr_time_cmp(gpr_time_add(connect_deadline, gpr_time_from_seconds(2)), - gpr_now()) > 0) { - int is_after_deadline = gpr_time_cmp(connect_deadline, gpr_now()) <= 0; + gpr_now(GPR_CLOCK_REALTIME)) > 0) { + int is_after_deadline = + gpr_time_cmp(connect_deadline, gpr_now(GPR_CLOCK_REALTIME)) <= 0; if (is_after_deadline && gpr_time_cmp(gpr_time_add(connect_deadline, gpr_time_from_seconds(1)), - gpr_now()) > 0) { + gpr_now(GPR_CLOCK_REALTIME)) > 0) { /* allow some slack before insisting that things be done */ } else { GPR_ASSERT(g_connections_complete == |