From 5ead7eb0206edc820583d026dcaa41e284d013b5 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Tue, 2 Jun 2015 09:42:59 +0100 Subject: [PATCH] Fix TTL breakage + cosmetic fixes --- nameserver/server_cache_test.go | 10 +++++----- nameserver/server_test.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nameserver/server_cache_test.go b/nameserver/server_cache_test.go index 97c7a532..4474ac5e 100644 --- a/nameserver/server_cache_test.go +++ b/nameserver/server_cache_test.go @@ -69,8 +69,8 @@ func TestServerDbCacheInvalidation(t *testing.T) { MaxAnswers: 4, }) wt.AssertNoErr(t, err) - defer srv.Stop() go srv.Start() + defer srv.Stop() time.Sleep(100 * time.Millisecond) // Allow server goroutine to start testPort, err := srv.GetPort() @@ -153,7 +153,7 @@ func TestServerDbCacheInvalidation(t *testing.T) { assertInCache(t, cache, qotherPtr, "after adding a new IP") // check that after some time, the cache entry is expired - clk.Forward(int(localTTL) + 1) + clk.Forward(int(DefaultLocalTTL) + 1) assertNotInCache(t, cache, qotherName, "after passing some time") assertNotInCache(t, cache, qwrongName, "after passing some time") @@ -226,13 +226,13 @@ func TestServerCacheExpiration(t *testing.T) { t.Logf("Zone database #2:\n%s", dbs[1].Zone) // Check that the DNS server returns updated information, and it will be - // cached during [0, localTTL] + // cached during [0, DefaultLocalTTL] qName1, _ = assertExchange(t, testName1, dns.TypeA, testPort, 1, 1, 0) assertInCache(t, cache, qName1, fmt.Sprintf("after asking for %s", testName1)) - clk.Forward(int(localTTL) - 1) + clk.Forward(int(DefaultLocalTTL) - 1) assertInCache(t, cache, qName1, fmt.Sprintf("after asking for %s", testName1)) - // and it will expire after localTTL + // and it will expire after DefaultLocalTTL clk.Forward(2) assertNotInCache(t, cache, qName1, fmt.Sprintf("after asking for %s", testName1)) diff --git a/nameserver/server_test.go b/nameserver/server_test.go index 1af4c126..26bf3b5f 100644 --- a/nameserver/server_test.go +++ b/nameserver/server_test.go @@ -88,8 +88,8 @@ func TestUDPDNSServer(t *testing.T) { ListenReadTimeout: testSocketTimeout, }) wt.AssertNoErr(t, err) - defer srv.Stop() go srv.Start() + defer srv.Stop() time.Sleep(100 * time.Millisecond) // Allow sever goroutine to start var r *dns.Msg @@ -189,8 +189,8 @@ func TestTCPDNSServer(t *testing.T) { ListenReadTimeout: testSocketTimeout, }) wt.AssertNoErr(t, err) - defer srv.Stop() go srv.Start() + defer srv.Stop() time.Sleep(100 * time.Millisecond) // Allow sever goroutine to start testPort, err := srv.GetPort()