From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 25 May 2020 11:53:57 +0000 (+0200)
Subject: tests: move check_answer() into require('tests_utils')
X-Git-Tag: v5.1.2~8^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=876bea09cf1e801401f2c3b837746a38f443f009;p=thirdparty%2Fknot-resolver.git

tests: move check_answer() into require('tests_utils')
---

diff --git a/daemon/cache.test/clear.test.lua b/daemon/cache.test/clear.test.lua
index 91e851e58..37bd8ab27 100644
--- a/daemon/cache.test/clear.test.lua
+++ b/daemon/cache.test/clear.test.lua
@@ -37,18 +37,7 @@ ev = event.after(0, function () return 1 end)
 trust_anchors.remove('.')
 trust_anchors.add('. IN DS 48409 8 2 3D63A0C25BCE86621DE63636F11B35B908EFE8E9381E0E3E9DEFD89EA952C27D')
 
-local function check_answer(desc, qname, qtype, expected_rcode)
-	qtype_str = kres.tostring.type[qtype]
-	callback = function(pkt)
-		same(pkt:rcode(), expected_rcode,
-		     desc .. ': expecting answer for query ' .. qname .. ' ' .. qtype_str
-		      .. ' with rcode ' .. kres.tostring.rcode[expected_rcode])
-
-		ok((pkt:ancount() > 0) == (pkt:rcode() == kres.rcode.NOERROR),
-		   desc ..': checking number of answers for ' .. qname .. ' ' .. qtype_str)
-	end
-	resolve(qname, qtype, kres.class.IN, {}, callback)
-end
+local check_answer = require('test_utils').check_answer
 
 -- do not attempt to contact outside world, operate only on cache
 net.ipv4 = false
diff --git a/tests/config/test_utils.lua b/tests/config/test_utils.lua
index 3771205bc..24737e7ce 100644
--- a/tests/config/test_utils.lua
+++ b/tests/config/test_utils.lua
@@ -39,4 +39,17 @@ function M.not_contains(table, value, message)
 	return contains(fail, pass, table, value, message)
 end
 
+function M.check_answer(desc, qname, qtype, expected_rcode)
+	qtype_str = kres.tostring.type[qtype]
+	callback = function(pkt)
+		same(pkt:rcode(), expected_rcode,
+		     desc .. ': expecting answer for query ' .. qname .. ' ' .. qtype_str
+		      .. ' with rcode ' .. kres.tostring.rcode[expected_rcode])
+
+		ok((pkt:ancount() > 0) == (pkt:rcode() == kres.rcode.NOERROR),
+		   desc ..': checking number of answers for ' .. qname .. ' ' .. qtype_str)
+	end
+	resolve(qname, qtype, kres.class.IN, {}, callback)
+end
+
 return M