commit 78382d557ab3da0b11f4fbda829f463067fc808f Merge: 86498e5aa fe3dfe7e3 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 7 11:33:14 2018 -0500

Merge remote-tracking branch 'dgoulet/bug25113_029_01'

changes/bug25113 | 5 +++++ src/test/test_util.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

diff --cc src/test/test_util.c index ba4ac3c06,dd122b250..b67fad58e --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -5838,16 -5541,11 +5838,16 @@@ test_util_monotonic_time(void *arg tt_u64_op(usec1, OP_GE, nsec1 / 1000); tt_u64_op(msecc1, OP_GE, nsecc1 / 1000000); tt_u64_op(usecc1, OP_GE, nsecc1 / 1000); - tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 1); - tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 1000); - tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1); - tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000); + tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 10); + tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 10000); + tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 10); + tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10000);

+ uint64_t coarse_stamp_diff = + monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1); + tt_u64_op(coarse_stamp_diff, OP_GE, 120); + tt_u64_op(coarse_stamp_diff, OP_LE, 1200); + done: ; }