From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 6 Jan 2026 13:17:14 +0000 (+0200)
Subject: [Test] Reduce DNS timeout, retransmits
X-Git-Tag: 3.14.3~8^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84e00aedaecc3d0fd48a0a6a2895810ee00d5be1;p=thirdparty%2Frspamd.git

[Test] Reduce DNS timeout, retransmits
---

diff --git a/test/functional/configs/clickhouse.conf b/test/functional/configs/clickhouse.conf
index f92f2e759f..91c123b9cd 100644
--- a/test/functional/configs/clickhouse.conf
+++ b/test/functional/configs/clickhouse.conf
@@ -4,8 +4,7 @@ options = {
   lua_path = "${INSTALLROOT}/share/rspamd/lib/?.lua"
   dns {
     nameserver = ["8.8.8.8", "8.8.4.4"];
-    retransmits = 10;
-    timeout = 2s;
+    retransmits = 2;
         fake_records = [{ # ed25519
           name = "test._domainkey.example.com";
           type = txt;
diff --git a/test/functional/configs/dkim.conf b/test/functional/configs/dkim.conf
index 3e26924607..2003b3d14f 100644
--- a/test/functional/configs/dkim.conf
+++ b/test/functional/configs/dkim.conf
@@ -4,8 +4,7 @@ options = {
   filters = ["dkim"]
   pidfile = "{= env.TMPDIR =}/rspamd.pid"
   dns {
-    retransmits = 10;
-    timeout = 2s;
+    retransmits = 2;
   }
 }
 logging = {
diff --git a/test/functional/configs/lua_test.conf b/test/functional/configs/lua_test.conf
index 1d36536dd8..f7c50ebe35 100644
--- a/test/functional/configs/lua_test.conf
+++ b/test/functional/configs/lua_test.conf
@@ -4,8 +4,7 @@ options = {
 	pidfile = "{= env.TMPDIR =}/rspamd.pid"
 	map_watch_interval = {= env.MAP_WATCH_INTERVAL =};
 	dns {
-		retransmits = 10;
-		timeout = 2s;
+		retransmits = 2;
 		fake_records = [{
 			name = "example.com",
 			type = "a";
diff --git a/test/functional/configs/merged-local.conf b/test/functional/configs/merged-local.conf
index b34fb6f12e..e55163841e 100644
--- a/test/functional/configs/merged-local.conf
+++ b/test/functional/configs/merged-local.conf
@@ -141,8 +141,7 @@ options = {
   url_tld = "{= env.TESTDIR =}/../lua/unit/test_tld.dat";
   dns {
     nameserver = ["8.8.8.8", "8.8.4.4"];
-    retransmits = 10;
-    timeout = 2s;
+    retransmits = 2;
         fake_records = [{
         # non-existent records requested by 350_surbl tests
         name = "114.73.21.104.test4.uribl", type = "a", rcode = "norec"},
diff --git a/test/functional/configs/milter.conf b/test/functional/configs/milter.conf
index dc623c82db..343123a22f 100644
--- a/test/functional/configs/milter.conf
+++ b/test/functional/configs/milter.conf
@@ -6,8 +6,7 @@ options = {
 	gtube_patterns = "all";
 	dns {
 		nameserver = ["8.8.8.8", "8.8.4.4"];
-		retransmits = 10;
-		timeout = 2s;
+		retransmits = 2;
 	}
 }
 logging = {
diff --git a/test/functional/configs/multiclass_bayes.conf b/test/functional/configs/multiclass_bayes.conf
index 278aeeee93..7c9081be53 100644
--- a/test/functional/configs/multiclass_bayes.conf
+++ b/test/functional/configs/multiclass_bayes.conf
@@ -3,8 +3,7 @@ options = {
 	url_tld = "{= env.TESTDIR =}/../lua/unit/test_tld.dat"
 	pidfile = "{= env.TMPDIR =}/rspamd.pid"
 	dns {
-		retransmits = 10;
-		timeout = 2s;
+		retransmits = 2;
 		fake_records = [{
 			name = "example.net";
 			type = txt;
diff --git a/test/functional/configs/password.conf b/test/functional/configs/password.conf
index 27b88eec36..cb3cf5eee0 100644
--- a/test/functional/configs/password.conf
+++ b/test/functional/configs/password.conf
@@ -3,8 +3,7 @@ options = {
 	url_tld = "{= env.TESTDIR =}/../lua/unit/test_tld.dat"
 	pidfile = "{= env.TMPDIR =}/rspamd.pid"
 	dns {
-		retransmits = 10;
-		timeout = 2s;
+		retransmits = 2;
 	}
 }
 logging = {
diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf
index 2e5dee93dc..5fbccf90dd 100644
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -6,8 +6,7 @@ options = {
   explicit_modules = ["settings", "bayes_expiry"];
   dns {
     nameserver = ["8.8.8.8", "8.8.4.4"];
-    retransmits = 10;
-    timeout = 2s;
+    retransmits = 2;
         fake_records = [{ # ed25519
           name = "test._domainkey.example.com";
           type = txt;
diff --git a/test/functional/configs/proxy.conf b/test/functional/configs/proxy.conf
index ff31eaea0f..9f0f15c5b2 100644
--- a/test/functional/configs/proxy.conf
+++ b/test/functional/configs/proxy.conf
@@ -4,9 +4,7 @@ options = {
 	pidfile = "{= env.TMPDIR =}/rspamd.pid"
 	lua_path = "{= env.INSTALLROOT =}/share/rspamd/lib/?.lua"
 	dns {
-		nameserver = ["8.8.8.8", "8.8.4.4"];
-		retransmits = 10;
-		timeout = 2s;
+		retransmits = 2;
 	}
 }
 logging = {
diff --git a/test/functional/configs/stats.conf b/test/functional/configs/stats.conf
index ba6a5fe9c7..440d3c6559 100644
--- a/test/functional/configs/stats.conf
+++ b/test/functional/configs/stats.conf
@@ -3,8 +3,7 @@ options = {
 	url_tld = "{= env.TESTDIR =}/../lua/unit/test_tld.dat"
 	pidfile = "{= env.TMPDIR =}/rspamd.pid"
 	dns {
-		retransmits = 10;
-		timeout = 2s;
+		retransmits = 2;
 		fake_records = [{
 			name = "example.net";
 			type = txt;
diff --git a/test/functional/configs/trivial.conf b/test/functional/configs/trivial.conf
index 97e3a301ea..763d5b8c54 100644
--- a/test/functional/configs/trivial.conf
+++ b/test/functional/configs/trivial.conf
@@ -4,9 +4,7 @@ options = {
 	pidfile = "{= env.TMPDIR =}/rspamd.pid";
 	lua_path = "{= env.INSTALLROOT =}/share/rspamd/lib/?.lua";
 	dns {
-	nameserver = ["8.8.8.8", "8.8.4.4"];
-      retransmits = 10;
-      timeout = 2s;
+            retransmits = 2;
 	}
 }
 logging = {