From: Jeremy C. Reed <jreed@ISC.org>
Date: Fri, 7 Sep 2012 12:12:23 +0000 (-0500)
Subject: [master] Allow for one more second in NXDOMAIN TTL checks
X-Git-Tag: trac2351_base~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31c4fcd5cd9f77e112090250d2571f975dba7ef4;p=thirdparty%2Fkea.git

[master] Allow for one more second in NXDOMAIN TTL checks

We have had 34 random off-by-one failures on real and virtual machines.

Previously it allowed a two second range (it slept for 2 seconds).
Now allow a three second range.

Discussed on jabber.
---

diff --git a/src/lib/cache/tests/negative_cache_unittest.cc b/src/lib/cache/tests/negative_cache_unittest.cc
index 4935e4a6af..78537631a3 100644
--- a/src/lib/cache/tests/negative_cache_unittest.cc
+++ b/src/lib/cache/tests/negative_cache_unittest.cc
@@ -98,8 +98,9 @@ TEST_F(NegativeCacheTest, testNXDOMAIN){
     rrset_ptr = *iter;
 
     // The TTL should equal to the TTL of negative response SOA record
+    // Allow for three second range.
     const RRTTL& nxdomain_ttl2 = rrset_ptr->getTTL();
-    EXPECT_GE(nxdomain_ttl2.getValue(), 86397);
+    EXPECT_GE(nxdomain_ttl2.getValue(), 86396);
     EXPECT_LE(nxdomain_ttl2.getValue(), 86398);
     // No RRset in ANSWER section
     EXPECT_TRUE(msg_nxdomain2.getRRCount(Message::SECTION_ANSWER) == 0);
@@ -120,7 +121,8 @@ TEST_F(NegativeCacheTest, testNXDOMAIN){
     rrset_ptr = *iter;
     const RRTTL& soa_ttl2 = rrset_ptr->getTTL();
     // The TTL should equal to the TTL of SOA record in answer section
-    EXPECT_GE(soa_ttl2.getValue(), 172797);
+    // Allow for three second range.
+    EXPECT_GE(soa_ttl2.getValue(), 172796);
     EXPECT_LE(soa_ttl2.getValue(), 172798);
 }