diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-10 11:46:52 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-10 11:46:52 -0700 |
| commit | be947697d7c5edb1f67c9df5ef024e3eaf98e9e6 (patch) | |
| tree | 774f0d333b48de97236fdb3e9382765a575a75ce /test/core/util/test_config.h | |
| parent | 3121fd4d757991e7ef95a7b6b370b83c23ba61b6 (diff) | |
| parent | 374cd9b0abbcd0dc3f1e65777e0dd37a9d5c447f (diff) | |
Merge github.com:grpc/grpc into immolating-conversion
Diffstat (limited to 'test/core/util/test_config.h')
| -rw-r--r-- | test/core/util/test_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h index b2cc40bb47..ccef8620c1 100644 --- a/test/core/util/test_config.h +++ b/test/core/util/test_config.h @@ -56,7 +56,7 @@ extern double g_fixture_slowdown_factor; #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) \ |