From 276bdb67aa0cb030bb46f818cba7d228abb68596 Mon Sep 17 00:00:00 2001
From: korgoth1 <vladislav.stakhov@gmail.com>
Date: Sun, 1 Sep 2019 19:44:00 +0300
Subject: [PATCH] [Test] fix uribl in mail address

---
 test/functional/cases/340_surbl.robot | 17 +++++++++--------
 test/functional/configs/surbl.conf    | 11 +----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/test/functional/cases/340_surbl.robot b/test/functional/cases/340_surbl.robot
index d4bbc2848..8ed5222b9 100644
--- a/test/functional/cases/340_surbl.robot
+++ b/test/functional/cases/340_surbl.robot
@@ -62,22 +62,23 @@ SURBL Example.com domain image false
 
 SURBL @example.com mail html
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/mailadr.eml
-  Should Contain  ${result.stdout}  URIBL_IN_MAIL (
-  Should Not Contain  ${result.stdout}  RSPAMD_URIBL
-  Should Not Contain  ${result.stdout}  DBL_SPAM (
-  Should Not Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Contain  ${result.stdout}  DBL_SPAM (
+  Should Contain  ${result.stdout}  example.com:email
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL_IMAGES (
   Should Not Contain  ${result.stdout}  DBL_PHISH (
   Should Not Contain  ${result.stdout}  URIBL_BLACK (
 
 SURBL @example.com mail text
   ${result} =  Scan Message With Rspamc  ${TESTDIR}/messages/mailadr2.eml
-  Should Contain  ${result.stdout}  URIBL_IN_MAIL (
-  Should Not Contain  ${result.stdout}  RSPAMD_URIBL
-  Should Not Contain  ${result.stdout}  DBL_SPAM (
-  Should Not Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Contain  ${result.stdout}  RSPAMD_URIBL (
+  Should Contain  ${result.stdout}  DBL_SPAM (
+  Should Contain  ${result.stdout}  example.com:email
+  Should Not Contain  ${result.stdout}  RSPAMD_URIBL_IMAGES (
   Should Not Contain  ${result.stdout}  DBL_PHISH (
   Should Not Contain  ${result.stdout}  URIBL_BLACK (
 
+
 *** Keywords ***
 Surbl Setup
   ${PLUGIN_CONFIG} =  Get File  ${TESTDIR}/configs/surbl.conf
diff --git a/test/functional/configs/surbl.conf b/test/functional/configs/surbl.conf
index 6acf73275..9752dcd1f 100644
--- a/test/functional/configs/surbl.conf
+++ b/test/functional/configs/surbl.conf
@@ -53,7 +53,7 @@ EOD;
     "RSPAMD_URIBL_IMAGES" {
       suffix = "test.uribl";
       check_dkim = true;
-      check_emails = true;
+      check_emails = false;
       images = true;
       process_script =<<EOD
   function(url, suffix)
@@ -63,14 +63,5 @@ EOD;
 end
 EOD;
     }
-    "URIBL_IN_MAIL" {
-      suffix = "test2.uribl";
-      no_ip = true;
-      check_emails = true;
-
-      ips = {
-      URIBL_IN_MAIL = "127.0.1.5";
-      }
-      }
   }
 }
\ No newline at end of file
-- 
2.39.5