From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 9 Jan 2018 10:45:46 +0000 (+0200)
Subject: [Test] Try improve test stability
X-Git-Tag: 1.7.0~302
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=662b20a3db28e039ca9ca8d36e6a19d6030a8e12;p=rspamd.git

[Test] Try improve test stability
---

diff --git a/test/functional/configs/multimap.conf b/test/functional/configs/multimap.conf
index 28d84f38e..98701794f 100644
--- 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 491a60241..9f276dd1b 100644
--- 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