aboutsummaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorAndrew Lewis <nerf@judo.za.org>2018-01-09 12:45:46 +0200
committerAndrew Lewis <nerf@judo.za.org>2018-01-09 12:53:26 +0200
commit662b20a3db28e039ca9ca8d36e6a19d6030a8e12 (patch)
treea3229a2a62423f1825bd91e392856e005870755f /test/functional
parente0d4da6e21550abd7a491699d74e564b52318bff (diff)
downloadrspamd-662b20a3db28e039ca9ca8d36e6a19d6030a8e12.tar.gz
rspamd-662b20a3db28e039ca9ca8d36e6a19d6030a8e12.zip
[Test] Try improve test stability
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/configs/multimap.conf2
-rw-r--r--test/functional/lib/rspamd.robot1
2 files changed, 2 insertions, 1 deletions
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