commit 477538d214cba3100191719744e64e7de0bbaec6
author Craig Tiller <ctiller@google.com> Thu Aug 27 21:06:01 2015 -0700
committer Craig Tiller <ctiller@google.com> Thu Aug 27 21:06:01 2015 -0700
tree 5f361e8883683916b30124dc123a2c288808aa9b
parent 89d56103eb9de65e148f1d839a686e591763d73e
parent cf44bb5027b2700ab21f677bc2982e2b1ac0c267

Merge pull request #3101 from yang-g/string_ref_auth

Use millis instead of micros in seconds_timeout and reduce a large deadline.

test/core/iomgr/udp_server_test.c

diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c
index 471d5b5..c91752b 100644
--- a/test/core/iomgr/udp_server_test.c
+++ b/test/core/iomgr/udp_server_test.c
@@ -135,7 +135,7 @@
   gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset));
 
   for (i = 0; i < number_of_clients; i++) {
-    deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(4000);
+    deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10);
 
     number_of_reads_before = g_number_of_reads;
     /* Create a socket, send a packet to the UDP server. */

test/core/util/test_config.h

diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h
index b2cc40b..ccef862 100644
--- a/test/core/util/test_config.h
+++ b/test/core/util/test_config.h
@@ -56,7 +56,7 @@
 
 #define GRPC_TIMEOUT_SECONDS_TO_DEADLINE(x)                                \
   gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),                               \
-               gpr_time_from_micros(GRPC_TEST_SLOWDOWN_FACTOR * 1e6 * (x), \
+               gpr_time_from_millis(GRPC_TEST_SLOWDOWN_FACTOR * 1e3 * (x), \
                                     GPR_TIMESPAN))
 
 #define GRPC_TIMEOUT_MILLIS_TO_DEADLINE(x)                                 \