From e8a6b340d5bff376cf78adeef41d17bbfec3d103 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 13 Oct 2020 20:06:08 +0100 Subject: [PATCH] Revert "Testsuite: allow 1s timing slop in dumpdb output" This reverts commit 625cd9501315e1010ecbf8718c88c8b79ce09e94. --- test/runtest | 4 ++-- test/stdout/0447 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/runtest b/test/runtest index 1f3da963f..19169e89d 100755 --- 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; - # Round the time-difference down to nearest even value - my($increment) = ((date_seconds($date3) - date_seconds($date2)) >> 1) << 1; + # Round the time-difference up to nearest even value + my($increment) = ((date_seconds($date3) - date_seconds($date2) + 1) >> 1) << 1; # 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 78eac2c8e..caecaea8a 100644 --- 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 + 28 +first failed = time last try = time2 next try = time2 + 30 +++++++++++++++++++++++++++ R:xx.test.again.dns -1 0 host lookup did not complete first failed = time last try = time2 next try = time2 + 180 -- 2.30.2