commit bb1eae8: [Test] Fix emailbl tests

[Vsevolod Stakhov]

Author: Vsevolod Stakhov
Date: 2019-09-23 15:11:27 +0100
URL: https://github.com/rspamd/rspamd/commit/bb1eae8f68f81e5c9723748d76e847fac688f8db (HEAD -> master)

[Test] Fix emailbl tests

---
 src/plugins/lua/rbl.lua            |  2 ++
 test/functional/configs/surbl.conf | 31 +++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 9feab5aea..b9682e0fc 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -857,6 +857,8 @@ local function add_rbl(key, rbl, global_opts)
 
     rspamd_logger.infox(rspamd_config, 'added rbl rule %s: %s',
         rbl.symbol, description)
+    lua_util.debugm(N, rspamd_config, 'rule dump for %s: %s',
+        rbl.symbol, rbl)
 
     if rbl.dkim then
       rspamd_config:register_dependency(rbl.symbol, 'DKIM_CHECK')
diff --git a/test/functional/configs/surbl.conf b/test/functional/configs/surbl.conf
index 823aec25c..5c244e257 100644
--- a/test/functional/configs/surbl.conf
+++ b/test/functional/configs/surbl.conf
@@ -64,21 +64,24 @@ EOD;
 end
 EOD;
     }
+
+  }
+}
+
+emails {
+  "whitelist" = [
+    "rspamd-test.com"
+  ]
+  rules {
     "RSPAMD_EMAILBL_FULL" {
-      suffix = "test5.uribl";
-      check_emails = true;
-      emails_domainonly = false;
-      urls = false;
-      replyto = true;
-      images = false;
+        dnsbl = "test5.uribl";
+        domain_only = false;
+        replyto = true;
+        }
+      "RSPAMD_EMAILBL_DOMAINONLY" {
+        dnsbl = "test6.uribl";
+        domain_only = true;
+        replyto = true;
       }
-    "RSPAMD_EMAILBL_DOMAINONLY" {
-      suffix = "test6.uribl";
-      check_emails = true;
-      emails_domainonly = true;
-      urls = false;
-      replyto = true;
-      images = false;
-    }
   }
 }
\ No newline at end of file