From 50ef6c716150437a4246aab03d74402dc1cd3cd9 Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Fri, 14 Oct 2016 15:08:18 +0200
Subject: [PATCH] [Test] Try improve test stability

---
 test/functional/cases/102_multimap.robot | 4 ++--
 test/functional/configs/dkim.conf        | 1 +
 test/functional/configs/fuzzy.conf       | 1 +
 test/functional/configs/lua_test.conf    | 1 +
 test/functional/configs/password.conf    | 1 +
 test/functional/configs/plugins.conf     | 1 +
 test/functional/configs/stats.conf       | 1 +
 test/functional/configs/trivial.conf     | 3 ++-
 test/functional/lib/rspamd.robot         | 2 +-
 9 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/functional/cases/102_multimap.robot b/test/functional/cases/102_multimap.robot
index 22551cba8..17ea2b741 100644
--- 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 b5158564d..7a8dacea2 100644
--- 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 deb518f4c..a426bb6e5 100644
--- 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 a485de4a6..50ec330ed 100644
--- 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 0280cc6f8..aa1dae564 100644
--- 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 05fd4c33c..d42510300 100644
--- 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 7e50d24b0..b503e5b56 100644
--- 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 9258df6b0..99ef1aff6 100644
--- 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 438aeb1bc..18e4f91eb 100644
--- 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
-- 
2.39.5