[Test] Try improve test stability

diff --git a/test/functional/cases/102_multimap.robot b/test/functional/cases/102_multimap.robot
index 22551cba84e10818c64a9049188145419418ec30..17ea2b7419b8aed9a798efc182e3a4af4d50d7a1 100644 (file)
--- a/test/functional/cases/102_multimap.robot
+++ b/test/functional/cases/102_multimap.robot
@@ -70,11 +70,11 @@ MAP - FROM REGEXP MISS
   Check Rspamc  ${result}  REGEXP_MAP  inverse=1
 
 MAP - DEPENDS HIT
-  ${result} =  Scan Message With Rspamc  ${MESSAGE}  -i  147.243.1.47  --from  user123@microsoft.com
+  ${result} =  Scan Message With Rspamc  ${MESSAGE}  -i  5.9.155.182  --from  user123@rspamd.com
   Check Rspamc  ${result}  DEPS_MAP
 
 MAP - DEPENDS MISS
-  ${result} =  Scan Message With Rspamc  ${MESSAGE}  -i  127.0.0.1  --from  user123@microsoft.com
+  ${result} =  Scan Message With Rspamc  ${MESSAGE}  -i  1.2.3.4  --from  user123@rspamd.com
   Check Rspamc  ${result}  DEPS_MAP  inverse=1
 
 MAP - MULSYM PLAIN

diff --git a/test/functional/configs/dkim.conf b/test/functional/configs/dkim.conf
index b5158564d09317cda237cac534d6ca1dea6e7553..7a8dacea2090b4693119a9aee31c38aab762c3c0 100644 (file)
--- a/test/functional/configs/dkim.conf
+++ b/test/functional/configs/dkim.conf
@@ -23,6 +23,7 @@ worker {
                pubkey = "${KEY_PUB1}";
                privkey = "${KEY_PVT1}";
        }
+       task_timeout = 60s;
 }
 
 dkim {

diff --git a/test/functional/configs/fuzzy.conf b/test/functional/configs/fuzzy.conf
index deb518f4c26a1e39a3b4a1a40f28124e64530388..a426bb6e5e24d43e7eeaf0a86bb484a07e59a79e 100644 (file)
--- a/test/functional/configs/fuzzy.conf
+++ b/test/functional/configs/fuzzy.conf
@@ -28,6 +28,7 @@ worker {
        type = normal
        bind_socket = "${LOCAL_ADDR}:${PORT_NORMAL}";
        count = 1
+       task_timeout = 60s;
 }
 
 worker {

diff --git a/test/functional/configs/lua_test.conf b/test/functional/configs/lua_test.conf
index a485de4a621f89003f860d975ee69e1e1549afdf..50ec330ed5e87466acca5a4a0a48f5b5b769ad7d 100644 (file)
--- a/test/functional/configs/lua_test.conf
+++ b/test/functional/configs/lua_test.conf
@@ -20,6 +20,7 @@ worker {
        type = normal
        bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL}
        count = 1
+       task_timeout = 60s;
 }
 worker {
        type = controller

diff --git a/test/functional/configs/password.conf b/test/functional/configs/password.conf
index 0280cc6f865cf7df4ba0799399a569a8f5b59e79..aa1dae564638516f533aa9ae83a0e98b6f94efd8 100644 (file)
--- a/test/functional/configs/password.conf
+++ b/test/functional/configs/password.conf
@@ -24,6 +24,7 @@ worker {
                pubkey = "${KEY_PUB1}";
                privkey = "${KEY_PVT1}";
        }
+       task_timeout = 60s;
 }
 worker {
        type = controller

diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf
index 05fd4c33c712de53a0751e784e452a61f2a8848a..d4251030064b3f2222d006a3dc8525ceaff56fde 100644 (file)
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -23,6 +23,7 @@ worker {
        type = normal
        bind_socket = ${LOCAL_ADDR}:${PORT_NORMAL}
        count = 1
+       task_timeout = 60s;
 }
 modules {
     path = "${TESTDIR}/../../src/plugins/lua/"

diff --git a/test/functional/configs/stats.conf b/test/functional/configs/stats.conf
index 7e50d24b0f191f96c557eebb39136441faa7cc0e..b503e5b56c64eead70e0cc844cacd953cd547da1 100644 (file)
--- a/test/functional/configs/stats.conf
+++ b/test/functional/configs/stats.conf
@@ -24,6 +24,7 @@ worker {
                pubkey = "${KEY_PUB1}";
                privkey = "${KEY_PVT1}";
        }
+       task_timeout = 60s;
 }
 worker {
        type = controller

diff --git a/test/functional/configs/trivial.conf b/test/functional/configs/trivial.conf
index 9258df6b0c81e31777b6dde1eaee2b6781e09e0f..99ef1aff60284a80f5ded06a96977df3011a9b64 100644 (file)
--- a/test/functional/configs/trivial.conf
+++ b/test/functional/configs/trivial.conf
@@ -24,4 +24,5 @@ worker {
                pubkey = "${KEY_PUB1}";
                privkey = "${KEY_PVT1}";
        }
-}
\ No newline at end of file
+       task_timeout = 60s;
+}

diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index 438aeb1bc732bd276c566bde25b7ce08239e9f8e..18e4f91eb77edd8e5b044082463a714deba6693d 100644 (file)
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -90,7 +90,7 @@ Run Redis
 
 Run Rspamc
   [Arguments]  @{args}
-  ${result} =  Run Process  ${RSPAMC}  @{args}  env:LD_LIBRARY_PATH=${TESTDIR}/../../contrib/aho-corasick
+  ${result} =  Run Process  ${RSPAMC}  -t  60  @{args}  env:LD_LIBRARY_PATH=${TESTDIR}/../../contrib/aho-corasick
   [Return]  ${result}
 
 Run Rspamd