Testsuite: allow 1s timing slop in dumpdb output

diff --git a/test/runtest b/test/runtest
index 59184786b4a2e49ef0f98e7c039d67a1760a3c33..8a1e46edd75d3cc8115397557922db7c66aa9bdf 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -461,8 +461,8 @@ RESET_AFTER_EXTRA_LINE_READ:
     my($date1,$date2,$date3,$expired) = ($1,$2,$3,$4);
     $expired = '' if !defined $expired;
 
     my($date1,$date2,$date3,$expired) = ($1,$2,$3,$4);
     $expired = '' if !defined $expired;
 

-    # Round the time-difference up to nearest even value
-    my($increment) = ((date_seconds($date3) - date_seconds($date2) + 1) >> 1) << 1;
+    # Round the time-difference down to nearest even value
+    my($increment) = ((date_seconds($date3) - date_seconds($date2)) >> 1) << 1;

 
     # We used to use globally unique replacement values, but timing
     # differences make this impossible. Just show the increment on the
 
     # We used to use globally unique replacement values, but timing
     # differences make this impossible. Just show the increment on the

diff --git a/test/stdout/0447 b/test/stdout/0447
index caecaea8abbd489c4da4742f063aee338e8735ae..78eac2c8eb57a9dccf11ae67d3ccbed0370d3f78 100644 (file)
--- a/test/stdout/0447
+++ b/test/stdout/0447
@@ -11,7 +11,7 @@ first failed = time last try = time2 next try = time2 + 60
 first failed = time last try = time2 next try = time2 + 30
 +++++++++++++++++++++++++++
   T:127.0.0.1:127.0.0.1:1224 dd 321 Connection timed out
 first failed = time last try = time2 next try = time2 + 30
 +++++++++++++++++++++++++++
   T:127.0.0.1:127.0.0.1:1224 dd 321 Connection timed out

-first failed = time last try = time2 next try = time2 + 30
+first failed = time last try = time2 next try = time2 + 28

 +++++++++++++++++++++++++++
   R:xx.test.again.dns -1 0 host lookup did not complete
 first failed = time last try = time2 next try = time2 + 180
 +++++++++++++++++++++++++++
   R:xx.test.again.dns -1 0 host lookup did not complete
 first failed = time last try = time2 next try = time2 + 180