[Test] Try improve test stability

diff --git a/test/functional/configs/multimap.conf b/test/functional/configs/multimap.conf
index 28d84f38e4eba9e1cf61d99fd3314a1a4e4ef1ba..98701794f74ff099f42a235747762291d8f7c06f 100644 (file)
--- a/test/functional/configs/multimap.conf
+++ b/test/functional/configs/multimap.conf
@@ -29,7 +29,7 @@ multimap {
     filter = "email:addr";
     regexp = true;
     map = "${TESTDIR}/configs/maps/regexp.list";
-    require_symbols = "R_SPF_ALLOW & REGEXP_MAP & !FROM_MAP";
+    require_symbols = "(R_SPF_ALLOW|R_SPF_DNSFAIL) & REGEXP_MAP & !FROM_MAP";
   }
   RCPT_DOMAIN {
     type = "rcpt";

diff --git a/test/functional/lib/rspamd.robot b/test/functional/lib/rspamd.robot
index 491a60241f3c6b630f6b9a9f77d3b4e2f3e15977..9f276dd1b0711a0ad1a25f4c01da748f1eb9a14b 100644 (file)
--- a/test/functional/lib/rspamd.robot
+++ b/test/functional/lib/rspamd.robot
@@ -138,6 +138,7 @@ Run Rspamd
   Wait Until Keyword Succeeds  30 sec  1 sec  Check Pidfile  ${tmpdir}/rspamd.pid
   ${rspamd_pid} =  Get File  ${tmpdir}/rspamd.pid
   Set To Dictionary  ${d}  RSPAMD_LOGPOS=${rspamd_logpos}  RSPAMD_PID=${rspamd_pid}  TMPDIR=${tmpdir}
+  Sleep  1s  Give a moment to read maps
   [Return]  &{d}
 
 Scan Message With Rspamc