[tor-commits] [tor/release-0.2.9] Increase tolerances in util/monotonic_time tests

[nickm at torproject.org]

commit fce425e3ff0281de29f04ac46d8c395befee607d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 7 11:08:54 2016 -0500

    Increase tolerances in util/monotonic_time tests
    
    This is an attempt to fix #19974.
---
 changes/19974        | 5 +++++
 src/test/test_util.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/19974 b/changes/19974
new file mode 100644
index 0000000..5496143
--- /dev/null
+++ b/changes/19974
@@ -0,0 +1,5 @@
+  o Minor bugfixes (unit tests):
+    - Fix tolerances in unit tests for monotonic time comparisons between
+      nanoseconds and microseconds. Previously, we accepted a 10 us
+      difference only, which is not realistic on every platform's
+      clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha.
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 7276c0c..fcda564 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5531,9 +5531,9 @@ test_util_monotonic_time(void *arg)
   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 +10);
+  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 + 10);
+  tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000);
 
  done:
   ;