From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 17 Apr 2020 10:56:21 +0000 (+0100)
Subject: [Test] Enrich rbl tests
X-Git-Tag: 2.6~516
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bdb0a5283582c205603593256c241558221653ab;p=rspamd.git

[Test] Enrich rbl tests
---

diff --git a/test/functional/cases/300_rbl.robot b/test/functional/cases/300_rbl.robot
index ef858558c..a8f72aed6 100644
--- a/test/functional/cases/300_rbl.robot
+++ b/test/functional/cases/300_rbl.robot
@@ -35,6 +35,7 @@ RBL RECEIVED HIT
 RBL FROM HIT WL
   ${result} =  Scan Message With Rspamc  ${MESSAGE}  -i  4.3.2.4
   Check Rspamc  ${result}  FAKE_RBL_CODE_2  inverse=True
+  Should Contain  ${result.stdout}  FAKE_WL_RBL_CODE_2 (1.00)[4.3.2.4:from, FAKE_RBL_UNKNOWN]
 
 EMAILBL Compose Map 1
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url14.eml
@@ -47,7 +48,7 @@ EMAILBL Compose Map 2
 EMAILBL Compose Map 3
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url16.eml
   Should Contain  ${result.stdout}  RSPAMD_EMAILBL (0.00)[41.black.sanchez.com:email]
-  
+
 
 *** Keywords ***
 Rbl Setup
diff --git a/test/functional/configs/rbl.conf b/test/functional/configs/rbl.conf
index da5c59b53..2318f5b81 100644
--- a/test/functional/configs/rbl.conf
+++ b/test/functional/configs/rbl.conf
@@ -34,6 +34,7 @@ rbl {
     RSPAMD_EMAILBL {
       rbl = "test8.uribl";
       url_compose_map = "${TESTDIR}/configs/maps/url_compose_map_for_mails.list";
+      ignore_defaults = true;
       emails = true;
       emails_domainonly = true
       returncodes = {