[Test] URL compose map

diff --git a/test/functional/cases/300_rbl.robot b/test/functional/cases/300_rbl.robot
index 525786eb74a3309a8fd878b199c689f24733f52b..ef858558c9ae73b938ce97da7188e4141ffbbae0 100644 (file)
--- a/test/functional/cases/300_rbl.robot
+++ b/test/functional/cases/300_rbl.robot
@@ -38,16 +38,16 @@ RBL FROM HIT WL
 
 EMAILBL Compose Map 1
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url14.eml
-  Should Contain  ${result.stdout}  RSPAMD_EMAILBL (0.00)[user.dirty.sanchez.com:email]
+  Should Contain  ${result.stdout}  RSPAMD_EMAILBL (0.00)[dirty.sanchez.com:email]
 
 EMAILBL Compose Map 2
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/url15.eml
-  Should Contain  ${result.stdout}  RSPAMD_EMAILBL (0.00)[4.very.dirty.sanchez.com:email]
+  Should Contain  ${result.stdout}  RSPAMD_EMAILBL (0.00)[very.dirty.sanchez.com:email]
 
 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/plugins.conf b/test/functional/configs/plugins.conf
index 861b865451df5b68034d61383ec31977bc141240..e74ddd73d2925ccfefb0f38a8ada1c232cd4da30 100644 (file)
--- a/test/functional/configs/plugins.conf
+++ b/test/functional/configs/plugins.conf
@@ -691,17 +691,12 @@ options = {
           replies = ["127.0.0.2"];
         },
         {
-          name = "user.dirty.sanchez.com.test8.uribl";
+          name = "dirty.sanchez.com.test8.uribl";
           type = a;
           replies = ["127.0.0.2"];
         },
         {
-          name = "admin.dirty.sanchez.com.test8.uribl";
-          type = a;
-          replies = ["127.0.0.2"];
-        },
-        {
-          name = "4.very.dirty.sanchez.com.test8.uribl";
+          name = "very.dirty.sanchez.com.test8.uribl";
           type = a;
           replies = ["127.0.0.2"];
         },

diff --git a/test/functional/configs/rbl.conf b/test/functional/configs/rbl.conf
index e4a57576ecbe5480447353dc35f84d14a0550021..da5c59b53c9d1762af4a8e6e383dfc05c155beed 100644 (file)
--- a/test/functional/configs/rbl.conf
+++ b/test/functional/configs/rbl.conf
@@ -35,7 +35,7 @@ rbl {
       rbl = "test8.uribl";
       url_compose_map = "${TESTDIR}/configs/maps/url_compose_map_for_mails.list";
       emails = true;
-      emails_delimiter = ".";
+      emails_domainonly = true
       returncodes = {
         RSPAMD_EMAILBL = "127.0.0.2";
       }

diff --git a/test/functional/messages/url14.eml b/test/functional/messages/url14.eml
index 42653a6141041ba92609d9ac5f0d4c1f4aaba0e2..32632da4a29c6c9216b2a77a67b54ca2c1a0c70e 100644 (file)
--- a/test/functional/messages/url14.eml
+++ b/test/functional/messages/url14.eml
@@ -1,4 +1,4 @@
 Content-Type: text/plain
 
 user@dirty.sanchez.com
-admin@dirty.sanchez.com
\ No newline at end of file
+user@admin.dirty.sanchez.com
\ No newline at end of file

diff --git a/test/functional/messages/url15.eml b/test/functional/messages/url15.eml
index a55521e31237dcef32b5192e812bfef3eaa1bb66..1240979af5a37a3fdaa68e1a2f74925b9bcadb2c 100644 (file)
--- a/test/functional/messages/url15.eml
+++ b/test/functional/messages/url15.eml
@@ -1,4 +1,3 @@
 Content-Type: text/plain
 
-4@very.dirty.sanchez.com
-admin@dirty.sanchez.com
\ No newline at end of file
+4@very.dirty.sanchez.com
\ No newline at end of file

diff --git a/test/functional/messages/url16.eml b/test/functional/messages/url16.eml
index 49bd398aabe2ed4434e5e698ebf15e03829ddd1a..0dbe8079ab1e4406ffcaddca754807048ef304e8 100644 (file)
--- a/test/functional/messages/url16.eml
+++ b/test/functional/messages/url16.eml
@@ -1,4 +1,5 @@
 Content-Type: text/plain
 
-41@black.sanchez.com
-black@sanchez.com
\ No newline at end of file
+test@admin.dirty.sanchez.com
+admin@41.black.sanchez.com
+admin@black.sanchez.com
\ No newline at end of file