[Test] Reduce DNS timeout, retransmits

diff --git a/test/functional/configs/clickhouse.conf b/test/functional/configs/clickhouse.conf
index f92f2e759f88d7f90c639dff0dd8f59b44a3deab..91c123b9cd1151cb1e23966409d518540447ca49 100644 (file)
--- 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 3e2692460760a675e524f77d9f61a9a36c23c325..2003b3d14f366361dd03676530daf3a98522d0a9 100644 (file)
--- 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 1d36536dd8271c0139ab487a925aeaf9b09319f0..f7c50ebe35aad3bac930d606539fe65bcdd5c723 100644 (file)
--- 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 b34fb6f12e43137e29fb7e59a5519ddb2d3ee7a9..e55163841e76526d0ad34b9c1e56c4f860eeccb4 100644 (file)
--- 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 dc623c82db81d87169c49a45e48dff9212521de1..343123a22f880d36d95c3ffa48b1c352ab59308b 100644 (file)
--- 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 278aeeee932a6d9449151f2c8209a44b06447355..7c9081be53e8ea5ed1e56bd44ce934ff0b41eb7f 100644 (file)
--- 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 27b88eec3637b8bf9eede7a6e2470933fb947081..cb3cf5eee03bab8ec769f91b84e9bff83f5e8882 100644 (file)
--- 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 2e5dee93dc35579c49ad52e388f9ab167a1e9c75..5fbccf90dd2f10ae1ea833abaf8c915b86b310b7 100644 (file)
--- 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 ff31eaea0fa9614db8020eba6a5a1a36629bd045..9f0f15c5b2d4825a51c1692fe1d249e6b722651d 100644 (file)
--- 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 ba6a5fe9c750c6806227d8523951609232bfd069..440d3c65599476278c94f828ac7a28ea342da27d 100644 (file)
--- 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 97e3a301eab2d9fe12210713d2fe73402b129d78..763d5b8c54b97106bde80e276249c0ad08a18b34 100644 (file)
--- 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 = {