From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Sat, 6 Dec 2025 12:59:29 +0000 (+0100)
Subject: cache test: adjust conditions on cache usage
X-Git-Tag: v6.1.0~13^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d155d0dbe408a3327b39f70e122aea6fb2b86684;p=thirdparty%2Fknot-resolver.git

cache test: adjust conditions on cache usage

The KRU-based garbage collection reduced the LMDB size a bit
for a particular overall cache size setting.
Apple Silicon uses 16 KiB pages instead of the usual 4 KiB,
so the usage is a bit shifted and that's why we didn't notice earlier
(though before the KRU GC we adjusted in commit adaac913c5)

For example failure, see "not ok" lines in
https://cache.nixos.org/log/1452wsll1fxh38p0fbqa0vw1p7ki6v55-knot-resolver_6-6.0.17.drv
---

diff --git a/NEWS b/NEWS
index bf41d5030..d7a019d47 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Knot Resolver 6.0.18 (2026-mm-dd)
 Bugfixes
 --------
 - reload did not apply changes to /fallback (!1763)
+- fix config.cache.clear test on apple silicon (!1766)
 
 
 Knot Resolver 6.0.17 (2025-12-02)
diff --git a/daemon/cache.test/clear.test.lua b/daemon/cache.test/clear.test.lua
index e1f691496..92520578a 100644
--- a/daemon/cache.test/clear.test.lua
+++ b/daemon/cache.test/clear.test.lua
@@ -197,15 +197,15 @@ end
 return {
 	test_cache_used(0, 1),
 	import_zone,
-	test_cache_used(9, 11),
+	test_cache_used(10, 12),
 	test_exact_match_qtype,
 	test_exact_match_qname,
 	test_callback,
 	import_zone,
 	test_subtree,
-	test_cache_used(9, 11),
+	test_cache_used(10, 12),
 	test_subtree_limit,
-	test_cache_used(5, 8),
+	test_cache_used(6, 9),
 	test_apex,
 	import_zone,
 	test_root,