commit c8e7d65: [Test] URL compose map

[korgoth1]

Author: korgoth1
Date: 2020-03-11 22:45:07 +0300
URL: https://github.com/rspamd/rspamd/commit/c8e7d65b3970f106152bbcfbc8d5a2cf56a97f5e (refs/pull/3298/head)

[Test] URL compose map

---
 test/functional/cases/300_rbl.robot  | 6 +++---
 test/functional/configs/plugins.conf | 9 ++-------
 test/functional/configs/rbl.conf     | 2 +-
 test/functional/messages/url14.eml   | 2 +-
 test/functional/messages/url15.eml   | 3 +--
 test/functional/messages/url16.eml   | 5 +++--
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/test/functional/cases/300_rbl.robot b/test/functional/cases/300_rbl.robot
index 525786eb7..ef858558c 100644
--- 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 861b86545..e74ddd73d 100644
--- 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 e4a57576e..da5c59b53 100644
--- 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 42653a614..32632da4a 100644
--- a/test/functional/messages/url14.eml
+++ b/test/functional/messages/url14.eml
@@ -1,4 +1,4 @@
 Content-Type: text/plain
 
 user at dirty.sanchez.com
-admin at dirty.sanchez.com
\ No newline at end of file
+user at 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 a55521e31..1240979af 100644
--- a/test/functional/messages/url15.eml
+++ b/test/functional/messages/url15.eml
@@ -1,4 +1,3 @@
 Content-Type: text/plain
 
-4 at very.dirty.sanchez.com
-admin at dirty.sanchez.com
\ No newline at end of file
+4 at 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 49bd398aa..0dbe8079a 100644
--- a/test/functional/messages/url16.eml
+++ b/test/functional/messages/url16.eml
@@ -1,4 +1,5 @@
 Content-Type: text/plain
 
-41 at black.sanchez.com
-black at sanchez.com
\ No newline at end of file
+test at admin.dirty.sanchez.com
+admin at 41.black.sanchez.com
+admin at black.sanchez.com
\ No newline at end of file