[Test] Extend SPF tests

diff --git a/test/functional/cases/115_dmarc.robot b/test/functional/cases/115_dmarc.robot
index 2895729926afa3db405b182cbd477c7a37802124..583786e64604d8bb2c215c3c393f0e56cc3192b3 100644 (file)
--- a/test/functional/cases/115_dmarc.robot
+++ b/test/functional/cases/115_dmarc.robot
@@ -82,11 +82,21 @@ SPF DNSFAIL UNRESOLVEABLE INCLUDE
   ...  -i  37.48.67.26  -F  x@openarena.za.net
   Check Rspamc  ${result}  R_SPF_DNSFAIL
 
+SPF DNSFAIL FAILED INCLUDE
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/dmarc/bad_dkim1.eml
+  ...  -i  8.8.8.8  -F  x@fail2.org.org.za
+  Check Rspamc  ${result}  R_SPF_DNSFAIL
+
 SPF ALLOW UNRESOLVEABLE INCLUDE
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/dmarc/bad_dkim1.eml
   ...  -i  8.8.8.8  -F  x@openarena.za.net
   Check Rspamc  ${result}  R_SPF_ALLOW
 
+SPF ALLOW FAILED INCLUDE
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/dmarc/bad_dkim1.eml
+  ...  -i  8.8.4.4  -F  x@fail2.org.org.za
+  Check Rspamc  ${result}  R_SPF_ALLOW
+
 SPF NA NA
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/dmarc/bad_dkim1.eml
   ...  -i  8.8.8.8  -F  x@za
@@ -107,6 +117,11 @@ SPF PERMFAIL UNRESOLVEABLE REDIRECT
   ...  -i  8.8.8.8  -F  x@cacophony.za.org
   Check Rspamc  ${result}  R_SPF_PERMFAIL
 
+SPF DNSFAIL FAILED REDIRECT
+  ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/dmarc/bad_dkim1.eml
+  ...  -i  8.8.8.8  -F  x@fail1.org.org.za
+  Check Rspamc  ${result}  R_SPF_DNSFAIL
+
 SPF PERMFAIL
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/dmarc/bad_dkim1.eml
   ...  -i  8.8.8.8  -F  x@xzghgh.za.org

diff --git a/test/functional/configs/plugins.conf b/test/functional/configs/plugins.conf
index 1e03090829d1a168479352acf78fe7cd624989ca..05fd4c33c712de53a0751e784e452a61f2a8848a 100644 (file)
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -3,6 +3,9 @@ options = {
        url_tld = "${URL_TLD}"
        pidfile = "${TMPDIR}/rspamd.pid"
        lua_path = "${TESTDIR}/../../contrib/lua-fun/?.lua"
+       dns {
+               nameserver = ["8.8.8.8", "8.8.4.4"];
+       }
 }
 logging = {
        type = "file",